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

code simplification

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-16 11:18:26 +01:00
parent 6c38d394f5
commit bfcbee56dd
6 changed files with 36 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/org/geometerplus/android/fbreader/tree/BaseActivity.java
View file

@ -52,10 +52,6 @@ public abstract class BaseActivity extends ListActivity {
return myCurrentTree;
}
protected void setCurrentTree(FBTree tree) {
myCurrentTree = tree;
}
public abstract boolean isTreeSelected(FBTree tree);
protected boolean OLD_STYLE_FLAG = false;
@ -113,20 +109,24 @@ public abstract class BaseActivity extends ListActivity {
@Override
protected void onNewIntent(Intent intent) {
if (OPEN_TREE_ACTION.equals(intent.getAction())) {
final FBTree.Key key = (FBTree.Key)intent.getSerializableExtra(TREE_KEY_KEY);
final FBTree.Key selectedKey = (FBTree.Key)intent.getSerializableExtra(SELECTED_TREE_KEY_KEY);
myCurrentTree = getTreeByKey(key);
final ListAdapter adapter = getListAdapter();
adapter.replaceAll(myCurrentTree.subTrees());
setTitle(myCurrentTree.getTreeTitle());
final FBTree selectedTree =
selectedKey != null ? getTreeByKey(selectedKey) : adapter.getFirstSelectedItem();
setSelection(adapter.getIndex(selectedTree));
init(intent);
} else {
super.onNewIntent(intent);
}
}
protected void init(Intent intent) {
final FBTree.Key key = (FBTree.Key)intent.getSerializableExtra(TREE_KEY_KEY);
final FBTree.Key selectedKey = (FBTree.Key)intent.getSerializableExtra(SELECTED_TREE_KEY_KEY);
myCurrentTree = getTreeByKey(key);
final ListAdapter adapter = getListAdapter();
adapter.replaceAll(myCurrentTree.subTrees());
setTitle(myCurrentTree.getTreeTitle());
final FBTree selectedTree =
selectedKey != null ? getTreeByKey(selectedKey) : adapter.getFirstSelectedItem();
setSelection(adapter.getIndex(selectedTree));
}
private void openTreeInternal(FBTree tree, FBTree treeToSelect) {
switch (tree.getOpeningStatus()) {
case READY_TO_OPEN: