From 47efd8aa6f8e280694995e6773b7e600ef76dca0 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Wed, 7 Oct 2015 14:14:53 +0100 Subject: [PATCH] used android.util.Pair --- .../src/main/java/org/fbreader/util/Pair.java | 34 ------------------- .../android/fbreader/tree/TreeActivity.java | 9 +++-- .../org/geometerplus/android/util/UIUtil.java | 18 +++------- .../fbreader/book/FileInfoSet.java | 33 +++--------------- .../fbreader/library/FavoritesTree.java | 2 +- .../fbreader/library/FileFirstLevelTree.java | 2 +- .../fbreader/library/FileTree.java | 2 +- .../fbreader/library/FirstLevelTree.java | 2 +- .../fbreader/library/SearchResultsTree.java | 2 +- .../fbreader/library/SyncLabelTree.java | 2 +- .../fbreader/library/SyncTree.java | 2 +- .../network/tree/NetworkCatalogRootTree.java | 2 +- .../network/tree/NetworkCatalogTree.java | 3 +- .../network/tree/SearchCatalogTree.java | 2 +- .../geometerplus/fbreader/tree/FBTree.java | 2 +- 15 files changed, 25 insertions(+), 92 deletions(-) delete mode 100644 fbreader/app/src/main/java/org/fbreader/util/Pair.java diff --git a/fbreader/app/src/main/java/org/fbreader/util/Pair.java b/fbreader/app/src/main/java/org/fbreader/util/Pair.java deleted file mode 100644 index 9a3e89106..000000000 --- a/fbreader/app/src/main/java/org/fbreader/util/Pair.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2007-2015 FBReader.ORG Limited - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. - */ - -package org.fbreader.util; - -public final class Pair { - public T1 First; - public T2 Second; - - public Pair(T1 first, T2 second) { - First = first; - Second = second; - } - - public Pair() { - this(null, null); - } -} 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 a8d13d1e1..69f41797c 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 @@ -21,11 +21,10 @@ package org.geometerplus.android.fbreader.tree; import java.util.*; -import org.fbreader.util.Pair; - import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; +import android.util.Pair; import android.view.*; import org.geometerplus.android.util.UIMessageUtil; @@ -168,10 +167,10 @@ public abstract class TreeActivity extends ListActivity { } private void setTitleAndSubtitle(Pair pair) { - if (pair.Second != null) { - setTitle(pair.First + " - " + pair.Second); + if (pair.second != null) { + setTitle(pair.first + " - " + pair.second); } else { - setTitle(pair.First); + setTitle(pair.first); } } diff --git a/fbreader/app/src/main/java/org/geometerplus/android/util/UIUtil.java b/fbreader/app/src/main/java/org/geometerplus/android/util/UIUtil.java index 30b3f27c5..b0c893cd6 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/util/UIUtil.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/util/UIUtil.java @@ -27,6 +27,7 @@ import android.app.ProgressDialog; import android.content.Context; import android.os.Handler; import android.os.Message; +import android.util.Pair; import org.geometerplus.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.resources.ZLResource; @@ -34,16 +35,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource; public abstract class UIUtil { private static final Object ourMonitor = new Object(); private static ProgressDialog ourProgress; - private static class Pair { - final Runnable Action; - final String Message; - - Pair(Runnable action, String message) { - Action = action; - Message = message; - } - }; - private static final Queue ourTaskQueue = new LinkedList(); + private static final Queue> ourTaskQueue = new LinkedList>(); private static volatile Handler ourProgressHandler; private static boolean init() { @@ -59,7 +51,7 @@ public abstract class UIUtil { ourProgress.dismiss(); ourProgress = null; } else { - ourProgress.setMessage(ourTaskQueue.peek().Message); + ourProgress.setMessage(ourTaskQueue.peek().second); } ourMonitor.notify(); } @@ -106,8 +98,8 @@ public abstract class UIUtil { new Thread(new Runnable() { public void run() { while (ourProgress == currentProgress && !ourTaskQueue.isEmpty()) { - Pair p = ourTaskQueue.poll(); - p.Action.run(); + final Pair p = ourTaskQueue.poll(); + p.first.run(); synchronized (ourMonitor) { ourProgressHandler.sendEmptyMessage(0); try { diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/book/FileInfoSet.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/FileInfoSet.java index 679163fa3..f82fd46e5 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/book/FileInfoSet.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/book/FileInfoSet.java @@ -21,40 +21,15 @@ package org.geometerplus.fbreader.book; import java.util.*; -import org.geometerplus.zlibrary.core.util.MiscUtil; +import android.util.Pair; + import org.geometerplus.zlibrary.core.filesystem.*; public final class FileInfoSet { - private static final class Pair { - private final String myName; - private final FileInfo myParent; - - Pair(String name, FileInfo parent) { - myName = name; - myParent = parent; - } - - @Override - public int hashCode() { - return (myParent == null) ? myName.hashCode() : myParent.hashCode() + myName.hashCode(); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Pair)) { - return false; - } - Pair p = (Pair)o; - return myName.equals(p.myName) && MiscUtil.equals(myParent, p.myParent); - } - } - private final HashMap myInfosByFile = new HashMap(); private final HashMap myFilesByInfo = new HashMap(); - private final HashMap myInfosByPair = new HashMap(); + private final HashMap,FileInfo> myInfosByPair = + new HashMap,FileInfo>(); private final HashMap myInfosById = new HashMap(); private final LinkedHashSet myInfosToSave = new LinkedHashSet(); diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FavoritesTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FavoritesTree.java index c85dff178..7c0664e96 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FavoritesTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FavoritesTree.java @@ -19,7 +19,7 @@ package org.geometerplus.fbreader.library; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.resources.ZLResource; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileFirstLevelTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileFirstLevelTree.java index 025418b62..70841fd85 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileFirstLevelTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileFirstLevelTree.java @@ -21,7 +21,7 @@ package org.geometerplus.fbreader.library; import java.util.List; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.resources.ZLResource; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java index 58dd21147..8b662e6a2 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java @@ -21,7 +21,7 @@ package org.geometerplus.fbreader.library; import java.util.*; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.image.ZLImage; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FirstLevelTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FirstLevelTree.java index 0f95fc466..ed2abdfb1 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FirstLevelTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/FirstLevelTree.java @@ -19,7 +19,7 @@ package org.geometerplus.fbreader.library; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.resources.ZLResource; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SearchResultsTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SearchResultsTree.java index 5df62cc7a..1fc06947a 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SearchResultsTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SearchResultsTree.java @@ -19,7 +19,7 @@ package org.geometerplus.fbreader.library; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.resources.ZLResource; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncLabelTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncLabelTree.java index 5d55e9e18..3b64bb441 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncLabelTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncLabelTree.java @@ -19,7 +19,7 @@ package org.geometerplus.fbreader.library; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.resources.ZLResource; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncTree.java index d06c2aecd..e1515175e 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/library/SyncTree.java @@ -22,7 +22,7 @@ package org.geometerplus.fbreader.library; import java.util.Arrays; import java.util.List; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.resources.ZLResource; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java index 1c8a92822..a9834f0c6 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java @@ -19,7 +19,7 @@ package org.geometerplus.fbreader.network.tree; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.network.*; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java index d09d63f3c..cd0dc4aae 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/NetworkCatalogTree.java @@ -21,8 +21,9 @@ package org.geometerplus.fbreader.network.tree; import java.util.*; +import android.util.Pair; + import org.fbreader.util.Boolean3; -import org.fbreader.util.Pair; import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.network.QuietNetworkContext; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/SearchCatalogTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/SearchCatalogTree.java index 60701beb1..9bcbf4201 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/SearchCatalogTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/network/tree/SearchCatalogTree.java @@ -19,7 +19,7 @@ package org.geometerplus.fbreader.network.tree; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.network.ZLNetworkContext; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/tree/FBTree.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/tree/FBTree.java index 6f6e2f4d2..0962f757f 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/tree/FBTree.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/tree/FBTree.java @@ -21,7 +21,7 @@ package org.geometerplus.fbreader.tree; import java.io.Serializable; -import org.fbreader.util.Pair; +import android.util.Pair; import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.tree.ZLTree;