From 3f3bf22cfeebd7ee4808b6dd5b7b98e92e3d739b Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Thu, 1 Oct 2015 10:34:39 +0100 Subject: [PATCH] getListAdapter() -> getTreeAdapter() --- .../fbreader/library/LibraryActivity.java | 18 +++++++++--------- .../network/NetworkLibraryActivity.java | 8 ++++---- .../android/fbreader/tree/TreeActivity.java | 5 ++--- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryActivity.java index da809ded8..9966e041f 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryActivity.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/library/LibraryActivity.java @@ -116,7 +116,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt @Override protected void onListItemClick(ListView listView, View view, int position, long rowId) { - final LibraryTree tree = (LibraryTree)getListAdapter().getItem(position); + final LibraryTree tree = (LibraryTree)getTreeAdapter().getItem(position); if (tree instanceof ExternalViewTree) { runOrInstallExternalView(true); } else { @@ -185,7 +185,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt @Override public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) { final int position = ((AdapterView.AdapterContextMenuInfo)menuInfo).position; - final Book book = ((LibraryTree)getListAdapter().getItem(position)).getBook(); + final Book book = ((LibraryTree)getTreeAdapter().getItem(position)).getBook(); if (book != null) { createBookContextMenu(menu, book); } @@ -223,7 +223,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt @Override public boolean onContextItemSelected(MenuItem item) { final int position = ((AdapterView.AdapterContextMenuInfo)item.getMenuInfo()).position; - final Book book = ((LibraryTree)getListAdapter().getItem(position)).getBook(); + final Book book = ((LibraryTree)getTreeAdapter().getItem(position)).getBook(); if (book != null) { return onContextItemSelected(item.getItemId(), book); } @@ -256,7 +256,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt book.removeLabel(Book.FAVORITE_LABEL); myCollection.saveBook(book); if (getCurrentTree().onBookEvent(BookEvent.Updated, book)) { - getListAdapter().replaceAll(getCurrentTree().subtrees(), true); + getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true); } return true; case ContextItemId.MarkAsRead: @@ -276,7 +276,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt case ContextItemId.TryAgain: syncAgain(book); if (getCurrentTree().onBookEvent(BookEvent.Updated, book)) { - getListAdapter().replaceAll(getCurrentTree().subtrees(), true); + getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true); } return true; } @@ -360,7 +360,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt syncAgain(((BookTree)tree).Book); } } - getListAdapter().replaceAll(getCurrentTree().subtrees(), true); + getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true); return true; case OptionsItemId.DeleteAll: { @@ -405,7 +405,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt public void onClick(DialogInterface dialog, int which) { if (getCurrentTree() instanceof FileTree) { for (Book book : myBooks) { - getListAdapter().remove(new FileTree( + getTreeAdapter().remove(new FileTree( (FileTree)getCurrentTree(), BookUtil.fileByBook(book) )); @@ -419,7 +419,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt myCollection.removeBook(book, true); } if (doReplace) { - getListAdapter().replaceAll(getCurrentTree().subtrees(), true); + getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true); } } } @@ -491,7 +491,7 @@ public class LibraryActivity extends TreeActivity implements MenuIt public void onBookEvent(BookEvent event, Book book) { if (getCurrentTree().onBookEvent(event, book)) { - getListAdapter().replaceAll(getCurrentTree().subtrees(), true); + getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true); } } diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java index b2e535618..3b06366ca 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java @@ -302,7 +302,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity i } final int position = ((AdapterView.AdapterContextMenuInfo)menuInfo).position; - final NetworkTree tree = (NetworkTree)getListAdapter().getItem(position); + final NetworkTree tree = (NetworkTree)getTreeAdapter().getItem(position); if (tree != null) { menu.setHeaderTitle(tree.getName()); for (Action a : getContextMenuActions(tree)) { @@ -316,7 +316,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity i @Override public boolean onContextItemSelected(MenuItem item) { final int position = ((AdapterView.AdapterContextMenuInfo)item.getMenuInfo()).position; - final NetworkTree tree = (NetworkTree)getListAdapter().getItem(position); + final NetworkTree tree = (NetworkTree)getTreeAdapter().getItem(position); if (tree != null) { for (Action a : getContextMenuActions(tree)) { if (a.Code == item.getItemId()) { @@ -334,7 +334,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity i fillListClickList(); } - final NetworkTree tree = (NetworkTree)getListAdapter().getItem(position); + final NetworkTree tree = (NetworkTree)getTreeAdapter().getItem(position); for (Action a : myListClickActions) { if (a.isVisible(tree) && a.isEnabled(tree)) { checkAndRun(a, tree); @@ -411,7 +411,7 @@ public abstract class NetworkLibraryActivity extends TreeActivity i switch (code) { default: updateLoadingProgress(); - getListAdapter().replaceAll(getCurrentTree().subtrees(), true); + getTreeAdapter().replaceAll(getCurrentTree().subtrees(), true); break; case InitializationFailed: showInitLibraryDialog((String)params[0]); diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeActivity.java index 68c2e94cd..28851326d 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeActivity.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/tree/TreeActivity.java @@ -70,8 +70,7 @@ public abstract class TreeActivity extends ListActivity { super.onDestroy(); } - @Override - public TreeAdapter getListAdapter() { + public TreeAdapter getTreeAdapter() { return (TreeAdapter)super.getListAdapter(); } @@ -173,7 +172,7 @@ public abstract class TreeActivity extends ListActivity { // not myCurrentKey = key // because key might be null myCurrentKey = myCurrentTree.getUniqueKey(); - final TreeAdapter adapter = getListAdapter(); + final TreeAdapter adapter = getTreeAdapter(); adapter.replaceAll(myCurrentTree.subtrees(), false); setTitle(myCurrentTree.getTreeTitle()); final FBTree selectedTree =