yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 10:49:24 +02:00
Code Issues Releases Wiki Activity

code cleanup

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-14 19:12:17 +01:00
parent 15f43e0a3f
commit dc7268cb26
3 changed files with 26 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/org/geometerplus/android/fbreader/library/LibraryBaseActivity.java
View file

@ -41,11 +41,25 @@ abstract class LibraryBaseActivity extends BaseActivity implements MenuItem.OnMe
@Override @Override
protected void onActivityResult(int requestCode, int returnCode, Intent intent) { protected void onActivityResult(int requestCode, int returnCode, Intent intent) {
if (requestCode == CHILD_LIST_REQUEST && returnCode == RESULT_DO_INVALIDATE_VIEWS) { if (requestCode == CHILD_LIST_REQUEST && returnCode == RESULT_DO_INVALIDATE_VIEWS) {
if (myCurrentTree instanceof FileTree) {
startUpdate();
}
getListView().invalidateViews(); getListView().invalidateViews();
setResult(RESULT_DO_INVALIDATE_VIEWS); setResult(RESULT_DO_INVALIDATE_VIEWS);
} else if (requestCode == BOOK_INFO_REQUEST) {
getListView().invalidateViews();
} }
} }
private void startUpdate() {
new Thread(new Runnable() {
public void run() {
myCurrentTree.waitForOpening();
getListAdapter().replaceAll(myCurrentTree.subTrees());
}
}).start();
}
@Override @Override
public boolean onSearchRequested() { public boolean onSearchRequested() {
startSearch(BookSearchPatternOption.getValue(), true, null, false); startSearch(BookSearchPatternOption.getValue(), true, null, false);
@ -127,4 +141,15 @@ abstract class LibraryBaseActivity extends BaseActivity implements MenuItem.OnMe
return R.drawable.ic_list_library_books; return R.drawable.ic_list_library_books;
} }
@Override
protected void deleteBook(Book book, int mode) {
super.deleteBook(book, mode);
if (myCurrentTree instanceof FileTree) {
getListAdapter().remove(new FileTree((FileTree)myCurrentTree, book.File));
} else {
getListAdapter().replaceAll(myCurrentTree.subTrees());
}
getListView().invalidateViews();
}
} }

40
src/org/geometerplus/android/fbreader/library/LibraryTreeActivity.java
View file

@ -22,9 +22,6 @@ package org.geometerplus.android.fbreader.library;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import org.geometerplus.fbreader.library.Book;
import org.geometerplus.fbreader.library.FileTree;
public class LibraryTreeActivity extends LibraryBaseActivity { public class LibraryTreeActivity extends LibraryBaseActivity {
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
@ -50,41 +47,4 @@ public class LibraryTreeActivity extends LibraryBaseActivity {
getListView().setTextFilterEnabled(true); getListView().setTextFilterEnabled(true);
} }
@Override
protected void deleteBook(Book book, int mode) {
super.deleteBook(book, mode);
if (myCurrentTree instanceof FileTree) {
getListAdapter().remove(new FileTree((FileTree)myCurrentTree, book.File));
} else {
getListAdapter().replaceAll(myCurrentTree.subTrees());
}
getListView().invalidateViews();
}
@Override
protected void onActivityResult(int requestCode, int returnCode, Intent intent) {
if (myCurrentTree instanceof FileTree) {
if (requestCode == CHILD_LIST_REQUEST && returnCode == RESULT_DO_INVALIDATE_VIEWS) {
if (myCurrentTree instanceof FileTree) {
startUpdate();
}
getListView().invalidateViews();
setResult(RESULT_DO_INVALIDATE_VIEWS);
} else if (requestCode == BOOK_INFO_REQUEST) {
getListView().invalidateViews();
}
} else {
super.onActivityResult(requestCode, returnCode, intent);
}
}
private void startUpdate() {
new Thread(new Runnable() {
public void run() {
myCurrentTree.waitForOpening();
getListAdapter().replaceAll(myCurrentTree.subTrees());
}
}).start();
}
} }

7
src/org/geometerplus/fbreader/library/Library.java
View file

@ -70,12 +70,7 @@ public final class Library {
} }
private FirstLevelTree getFirstLevelTree(String key) { private FirstLevelTree getFirstLevelTree(String key) {
for (FBTree tree : myRootTree.subTrees()) { return (FirstLevelTree)myRootTree.getSubTree(key);
if (key.equals(tree.getUniqueKey().Id)) {
return (FirstLevelTree)tree;
}
}
return null;
} }
public LibraryTree getLibraryTree(LibraryTree.Key key) { public LibraryTree getLibraryTree(LibraryTree.Key key) {