cleanup

Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java

src/org/amse/ys/zip/NoCompressionDecompressor.java

@@ -13,6 +13,7 @@ public class NoCompressionDecompressor extends Decompressor {
 		myStream = is;
 	}
 
+	@Override
 	public int read(byte b[], int off, int len) throws IOException {
 		int i = 0;
 		for (; i < len; ++i) {
@@ -27,6 +28,7 @@ public class NoCompressionDecompressor extends Decompressor {
 		return (i > 0) ? i : -1;
 	}
 
+	@Override
 	public int read() throws IOException {
 		if (myCurrentPosition < myHeader.CompressedSize) {
 			myCurrentPosition++;
@@ -36,6 +38,7 @@ public class NoCompressionDecompressor extends Decompressor {
 		}
 	}
 	
+	@Override
 	public int available() throws IOException {
 		return (myHeader.UncompressedSize - myCurrentPosition);
 	}

src/org/geometerplus/android/fbreader/BookmarksActivity.java

@@ -206,6 +206,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
 		getTabHost().setCurrentTabByTag("found");
 	}
 
+	@Override
 	public boolean onMenuItemClick(MenuItem item) {
 		switch (item.getItemId()) {
 			case 1:
@@ -340,6 +341,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
 			}
 		}
 
+		@Override
 		public View getView(int position, View convertView, ViewGroup parent) {
 			final View view = (convertView != null) ? convertView :
 				LayoutInflater.from(parent.getContext()).inflate(R.layout.bookmark_item, parent, false);
@@ -366,18 +368,22 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
 			return view;
 		}
 
+		@Override
 		public final boolean areAllItemsEnabled() {
 			return true;
 		}
 
+		@Override
 		public final boolean isEnabled(int position) {
 			return true;
 		}
 
+		@Override
 		public final long getItemId(int position) {
 			return position;
 		}
 
+		@Override
 		public final Bookmark getItem(int position) {
 			if (myShowAddBookmarkItem) {
 				--position;
@@ -385,6 +391,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
 			return (position >= 0) ? myBookmarks.get(position) : null;
 		}
 
+		@Override
 		public final int getCount() {
 			return myShowAddBookmarkItem ? myBookmarks.size() + 1 : myBookmarks.size();
 		}

src/org/geometerplus/android/fbreader/FBReader.java

@@ -19,7 +19,6 @@
 
 package org.geometerplus.android.fbreader;
 
-import java.lang.reflect.*;
 import java.util.*;
 
 import android.app.Activity;
@@ -34,10 +33,8 @@ import android.widget.RelativeLayout;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.library.ZLibrary;
-import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 import org.geometerplus.zlibrary.text.view.ZLTextView;
-import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;
 
 import org.geometerplus.zlibrary.ui.android.R;
 import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow;

src/org/geometerplus/android/fbreader/FBReaderApplication.java

@@ -19,10 +19,7 @@
 
 package org.geometerplus.android.fbreader;
 
-import android.content.Intent;
-
 import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
-import org.geometerplus.android.fbreader.libraryService.LibraryService;
 
 public class FBReaderApplication extends ZLAndroidApplication {
 }

src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java

@@ -23,8 +23,6 @@ import android.content.Intent;
 import android.content.ActivityNotFoundException;
 import android.net.Uri;
 
-import org.geometerplus.zlibrary.core.network.ZLNetworkException;
-
 import org.geometerplus.zlibrary.text.view.*;
 
 import org.geometerplus.fbreader.fbreader.FBReaderApp;

src/org/geometerplus/android/fbreader/SetOrientationAction.java

@@ -25,8 +25,6 @@ import android.content.pm.ActivityInfo;
 import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.util.ZLBoolean3;
 
-import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
-
 import org.geometerplus.fbreader.fbreader.FBReaderApp;
 
 class SetScreenOrientationAction extends FBAndroidAction {

src/org/geometerplus/android/fbreader/TOCActivity.java

@@ -21,7 +21,6 @@ package org.geometerplus.android.fbreader;
 
 import android.app.ListActivity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.*;
 import android.widget.*;

src/org/geometerplus/android/fbreader/covers/CoverHolder.java

@@ -19,7 +19,6 @@
 
 package org.geometerplus.android.fbreader.covers;
 
-import java.util.*;
 import java.util.concurrent.Future;
 
 import android.widget.ImageView;

src/org/geometerplus/android/fbreader/covers/CoverManager.java

@@ -19,10 +19,7 @@
 
 package org.geometerplus.android.fbreader.covers;
 
-import java.util.*;
+import java.util.concurrent.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
 
 import android.app.Activity;
 import android.graphics.Bitmap;

src/org/geometerplus/android/fbreader/crash/MissingNativeLibraryActivity.java

@@ -27,12 +27,8 @@ import android.widget.TextView;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
-import org.geometerplus.fbreader.Paths;
-
 import org.geometerplus.zlibrary.ui.android.R;
 
-import org.geometerplus.android.fbreader.FBReader;
-
 public class MissingNativeLibraryActivity extends Activity {
 	@Override
 	protected void onCreate(Bundle bundle) {

src/org/geometerplus/android/fbreader/image/ImageViewActivity.java

@@ -27,9 +27,7 @@ import android.os.Bundle;
 import android.util.FloatMath;
 import android.view.*;
 
-import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.image.*;
-import org.geometerplus.zlibrary.core.util.MimeType;
 import org.geometerplus.zlibrary.core.util.ZLColor;
 
 import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;

src/org/geometerplus/android/fbreader/library/LibraryActivity.java

@@ -28,7 +28,6 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 
 import org.geometerplus.zlibrary.core.options.ZLStringOption;
-import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 import org.geometerplus.zlibrary.ui.android.R;

src/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java

@@ -19,7 +19,6 @@
 
 package org.geometerplus.android.fbreader.library;
 
-import android.graphics.Bitmap;
 import android.text.Html;
 import android.view.*;
 import android.widget.*;

src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java

@@ -32,7 +32,6 @@ import android.widget.Button;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.network.ZLNetworkManager;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
-import org.geometerplus.zlibrary.core.options.ZLStringOption;
 
 import org.geometerplus.fbreader.network.INetworkLink;
 import org.geometerplus.fbreader.network.NetworkLibrary;

src/org/geometerplus/android/fbreader/network/AuthorizationMenuActivity.java

@@ -19,13 +19,9 @@
 
 package org.geometerplus.android.fbreader.network;
 
-import java.util.*;
-
 import android.app.Activity;
 import android.content.*;
 import android.net.Uri;
-import android.view.*;
-import android.widget.*;
 
 import org.geometerplus.fbreader.network.INetworkLink;
 import org.geometerplus.fbreader.network.NetworkLibrary;

src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java

@@ -42,8 +42,6 @@ import org.geometerplus.fbreader.network.tree.NetworkBookTree;
 import org.geometerplus.fbreader.network.urlInfo.BookBuyUrlInfo;
 import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
 
-import org.geometerplus.android.fbreader.network.*;
-
 public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeListener {
 	public static void run(Activity activity, NetworkBookTree tree) {
 		run(activity, Collections.singletonList(tree));

src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java

@@ -35,6 +35,7 @@ public class UncaughtExceptionHandler implements java.lang.Thread.UncaughtExcept
 		myContext = context;
 	}
 
+	@Override
 	public void uncaughtException(Thread thread, Throwable exception) {
 		final StringWriter stackTrace = new StringWriter();
 		exception.printStackTrace(new PrintWriter(stackTrace));