Eclipse code cleanup

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1507 6a642e6f-84f6-412e-ac94-c4a38d5a04b0

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

@@ -1,9 +1,6 @@
 package org.amse.ys.zip;
 
 import java.io.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
 
 class ZipInputStream extends InputStream {
 	private final ZipFile myParent;

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

@@ -25,7 +25,6 @@ import android.view.*;
 import android.widget.*;
 import android.content.Context;
 
-import org.geometerplus.zlibrary.ui.android.R;
 
 class SimpleContainer extends ViewGroup {
 	private final View myEditText;

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

@@ -26,14 +26,12 @@ import android.view.*;
 import android.widget.*;
 import android.content.*;
 import android.app.TabActivity;
-import android.graphics.drawable.Drawable;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.text.view.*;
 
 import org.geometerplus.zlibrary.ui.android.R;
 
-import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.fbreader.fbreader.FBReader;
 import org.geometerplus.fbreader.library.*;
 
@@ -45,8 +43,8 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
 	private static final int DELETE_ITEM_ID = 2;
 
 	List<Bookmark> AllBooksBookmarks;
-	private final List<Bookmark> myThisBookBookmarks = new LinkedList();
+	private final List<Bookmark> myThisBookBookmarks = new LinkedList<Bookmark>();
-	private final List<Bookmark> mySearchResults = new LinkedList();
+	private final List<Bookmark> mySearchResults = new LinkedList<Bookmark>();
 
 	private ListView myThisBookView;
 	private ListView myAllBooksView;
@@ -396,7 +394,7 @@ mainLoop:
 			return myCurrentBook ? myBookmarks.size() + 1 : myBookmarks.size();
 		}
 
-		public final void onItemClick(AdapterView parent, View view, int position, long id) {
+		public final void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 			final Bookmark bookmark = getItem(position);
 			if (bookmark != null) {
 				gotoBookmark(bookmark);

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

@@ -27,7 +27,6 @@ import android.content.DialogInterface;
 
 import org.geometerplus.zlibrary.ui.android.R;
 
-import org.geometerplus.zlibrary.core.filesystem.*;
 import org.geometerplus.zlibrary.core.tree.ZLTree;
 import org.geometerplus.zlibrary.core.options.ZLStringOption;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
@@ -180,7 +179,7 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt
 			}
 		}
 
-		private ZLTree findFirstSelectedItem() {
+		private ZLTree<?> findFirstSelectedItem() {
 			if (myCurrentBook == null) {
 				return null;
 			}
@@ -228,7 +227,8 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt
 			return view;
 		}
 
-		protected boolean runTreeItem(ZLTree tree) {
+		@Override
+		protected boolean runTreeItem(ZLTree<?> tree) {
 			if (super.runTreeItem(tree)) {
 				return true;
 			}

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

@@ -25,7 +25,6 @@ import android.content.Intent;
 import android.widget.Toast;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
-import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager;
 
 import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager;
 

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

@@ -22,10 +22,7 @@ package org.geometerplus.android.fbreader;
 import android.os.Bundle;
 import android.view.*;
 import android.widget.*;
-import android.content.Context;
 import android.app.ListActivity;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
 
 import org.geometerplus.zlibrary.core.application.ZLApplication;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
@@ -39,7 +36,7 @@ import org.geometerplus.fbreader.fbreader.FBReader;
 
 public class TOCActivity extends ListActivity {
 	private TOCAdapter myAdapter;
-	private ZLTree mySelectedItem;
+	private ZLTree<?> mySelectedItem;
 
 	@Override
 	public void onCreate(Bundle bundle) {
@@ -92,11 +89,9 @@ public class TOCActivity extends ListActivity {
 	}
 
 	private final class TOCAdapter extends ZLTreeAdapter {
-		private final TOCTree myRoot;
 
 		TOCAdapter(TOCTree root) {
 			super(getListView(), root);
-			myRoot = root;
 		}
 
 		@Override
@@ -133,7 +128,7 @@ public class TOCActivity extends ListActivity {
 		}
 
 		@Override
-		protected boolean runTreeItem(ZLTree tree) {
+		protected boolean runTreeItem(ZLTree<?> tree) {
 			if (super.runTreeItem(tree)) {
 				return true;
 			}

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

@@ -21,10 +21,8 @@ package org.geometerplus.android.fbreader;
 
 import java.util.HashSet;
 
-import android.content.Context;
 import android.view.*;
 import android.widget.*;
-import android.graphics.Bitmap;
 
 import org.geometerplus.zlibrary.core.tree.ZLTree;
 
@@ -32,11 +30,11 @@ import org.geometerplus.zlibrary.ui.android.R;
 
 abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemClickListener, View.OnCreateContextMenuListener {
 	private final ListView myParent;
-	private ZLTree myTree;
+	private ZLTree<?> myTree;
-	private ZLTree[] myItems;
+	private ZLTree<?>[] myItems;
-	private final HashSet<ZLTree> myOpenItems = new HashSet<ZLTree>();
+	private final HashSet<ZLTree<?>> myOpenItems = new HashSet<ZLTree<?>>();
 
-	protected ZLTreeAdapter(ListView parent, ZLTree tree) {
+	protected ZLTreeAdapter(ListView parent, ZLTree<?> tree) {
 		myParent = parent;
 		myTree = tree;
 		myItems = new ZLTree[tree.getSize() - 1];
@@ -47,7 +45,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		parent.setOnCreateContextMenuListener(this);
 	}
 
-	protected final void openTree(ZLTree tree) {
+	protected final void openTree(ZLTree<?> tree) {
 		if (tree == null) {
 			return;
 		}
@@ -57,7 +55,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		}
 	}
 
-	public final void expandOrCollapseTree(ZLTree tree) {
+	public final void expandOrCollapseTree(ZLTree<?> tree) {
 		if (!tree.hasChildren()) {
 			return;
 		}
@@ -71,11 +69,11 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		notifyDataSetChanged();
 	}
 
-	public final boolean isOpen(ZLTree tree) {
+	public final boolean isOpen(ZLTree<?> tree) {
 		return myOpenItems.contains(tree);
 	}
 
-	public final void selectItem(ZLTree tree) {
+	public final void selectItem(ZLTree<?> tree) {
 		if (tree == null) {
 			return;
 		}
@@ -86,7 +84,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 			if (parent == null) {
 				break;
 			}
-			for (ZLTree sibling : parent.subTrees()) {
+			for (ZLTree<?> sibling : parent.subTrees()) {
 				if (sibling == tree) {
 					break;
 				}
@@ -103,7 +101,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 	private int getCount(ZLTree<?> tree) {
 		int count = 1;
 		if (isOpen(tree)) {
-			for (ZLTree subtree : tree.subTrees()) {
+			for (ZLTree<?> subtree : tree.subTrees()) {
 				count += getCount(subtree);
 			}
 		}
@@ -120,7 +118,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		}
 		--position;
 		int index = 1;
-		for (ZLTree subtree : tree.subTrees()) {
+		for (ZLTree<?> subtree : tree.subTrees()) {
 			int count = getCount(subtree);
 			if (count <= position) {
 				position -= count;
@@ -132,9 +130,9 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		throw new RuntimeException("That's impossible!!!");
 	}
 
-	public final ZLTree getItem(int position) {
+	public final ZLTree<?> getItem(int position) {
 		final int index = indexByPosition(position + 1, myTree) - 1;
-		ZLTree item = myItems[index];
+		ZLTree<?> item = myItems[index];
 		if (item == null) {
 			item = myTree.getTreeByParagraphNumber(index + 1);
 			myItems[index] = item;
@@ -154,7 +152,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		return indexByPosition(position + 1, myTree);
 	}
 
-	protected boolean runTreeItem(ZLTree tree) {
+	protected boolean runTreeItem(ZLTree<?> tree) {
 		if (!tree.hasChildren()) {
 			return false;
 		}
@@ -162,7 +160,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		return true;
 	}
 
-	protected void resetTree(ZLTree tree) {
+	protected void resetTree(ZLTree<?> tree) {
 		myTree = tree;
 		myItems = new ZLTree[tree.getSize() - 1];
 		myOpenItems.clear();
@@ -179,7 +177,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		notifyDataSetChanged();
 	}
 
-	public final void onItemClick(AdapterView parent, View view, int position, long id) {
+	public final void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 		runTreeItem(getItem(position));
 	}
 
@@ -188,7 +186,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 
 	public abstract View getView(int position, View convertView, ViewGroup parent);
 
-	protected final void setIcon(ImageView imageView, ZLTree tree) {
+	protected final void setIcon(ImageView imageView, ZLTree<?> tree) {
 		if (tree.hasChildren()) {
 			if (isOpen(tree)) {
 				imageView.setImageResource(R.drawable.ic_list_group_open);

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

@@ -209,7 +209,7 @@ abstract class NetworkBaseActivity extends ListActivity
 			return;
 		}
 		if (confirm != null) {
-			final ZLResource resource = myResource.getResource("confirmQuestions");
+			//final ZLResource resource = myResource.getResource("confirmQuestions");
 			final ZLResource buttonResource = ZLResource.resource("dialog").getResource("button");
 			new AlertDialog.Builder(this)
 				.setTitle(networkTree.getName())

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

@@ -40,7 +40,6 @@ class RefillAccountActions extends NetworkTreeActions {
 
 	@Override
 	public void buildContextMenu(NetworkBaseActivity activity, ContextMenu menu, NetworkTree tree) {
-		final RefillAccountTree refillTree = (RefillAccountTree) tree;
 		menu.setHeaderTitle(getTitleValue("refillTitle"));
 
 		addMenuItem(menu, REFILL_ITEM_ID, "refillTitle");

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

@@ -165,8 +165,6 @@ class RegisterUserDialog extends NetworkDialog {
 	}
 
 	public void prepareDialog(Dialog dialog) {
-		final NetworkAuthenticationManager mgr = myLink.authenticationManager();
-
 		((TextView) dialog.findViewById(R.id.network_register_login)).setText((myLogin != null) ? myLogin : "");
 		((TextView) dialog.findViewById(R.id.network_register_password)).setText((myPassword != null) ? myPassword : "");
 		((TextView) dialog.findViewById(R.id.network_register_confirm_password)).setText((myPassword != null) ? myPassword : "");

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

@@ -48,8 +48,6 @@ class SearchItemActions extends NetworkTreeActions {
 
 	@Override
 	public void buildContextMenu(NetworkBaseActivity activity, ContextMenu menu, NetworkTree tree) {
-		final SearchItemTree searchTree = (SearchItemTree) tree;
-		final SearchResult result = searchTree.getSearchResult();
 		menu.setHeaderTitle(tree.getName());
 
 		final boolean isLoading = NetworkView.Instance().containsItemsLoadingRunnable(NetworkSearchActivity.SEARCH_RUNNABLE_KEY);

src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.android.fbreader.preferences;
 
-import java.util.List;
-
 import android.content.Context;
 
 import org.geometerplus.zlibrary.core.resources.ZLResource;
@@ -35,7 +33,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
 		super("Preferences");
 	}
 
-	private static final class ColorProfilePreference extends ZLSimplePreference {
+	/*private static final class ColorProfilePreference extends ZLSimplePreference {
 		private final FBReader myFBReader;
 		private final Screen myScreen;
 		private final String myKey;
@@ -63,7 +61,7 @@ public class PreferenceActivity extends ZLPreferenceActivity {
 			myFBReader.setColorProfileName(myKey);
 			myScreen.close();
 		}
-	}
+	}*/
 
 	@Override
 	protected void init() {

src/org/geometerplus/android/fbreader/preferences/ZLSimplePreference.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.android.fbreader.preferences;
 
-import org.geometerplus.zlibrary.core.resources.ZLResource;
-
 import android.content.Context;
 import android.preference.Preference;
 

src/org/geometerplus/fbreader/bookmodel/BookModel.java

@@ -20,9 +20,7 @@
 package org.geometerplus.fbreader.bookmodel;
 
 import java.util.*;
-//import java.io.*;
+
-import org.geometerplus.zlibrary.core.util.*;
-import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.image.*;
 
 import org.geometerplus.zlibrary.text.model.*;

src/org/geometerplus/fbreader/bookmodel/BookReader.java

@@ -19,7 +19,6 @@
 
 package org.geometerplus.fbreader.bookmodel;
 
-import java.util.*;
 import org.geometerplus.zlibrary.core.util.*;
 
 import java.nio.ByteBuffer;

src/org/geometerplus/fbreader/fbreader/ClearFindResultsAction.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.fbreader.fbreader;
 
-import org.geometerplus.zlibrary.text.view.ZLTextView;
-
 class ClearFindResultsAction extends FBAction {
 	ClearFindResultsAction(FBReader fbreader) {
 		super(fbreader);

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

@@ -19,14 +19,9 @@
 
 package org.geometerplus.fbreader.fbreader;
 
-import java.io.*;
-import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
-
 import org.geometerplus.zlibrary.core.filesystem.*;
 import org.geometerplus.zlibrary.core.application.*;
 import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.options.*;
 
 import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;

src/org/geometerplus/fbreader/fbreader/FBView.java

@@ -25,7 +25,6 @@ import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.text.model.ZLTextModel;
 import org.geometerplus.zlibrary.text.view.*;
 
-import org.geometerplus.fbreader.bookmodel.FBTextKind;
 import org.geometerplus.fbreader.bookmodel.FBHyperlinkType;
 
 public final class FBView extends ZLTextView {

src/org/geometerplus/fbreader/fbreader/SwitchProfileAction.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.fbreader.fbreader;
 
-import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager;
-
 class SwitchProfileAction extends FBAction {
 	private String myProfileName;
 

src/org/geometerplus/fbreader/fbreader/TrackballScrollingAction.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.fbreader.fbreader;
 
-import org.geometerplus.zlibrary.text.view.ZLTextView;
-
 class TrackballScrollingAction extends FBAction {
 	private final boolean myForward;
 

src/org/geometerplus/fbreader/fbreader/VolumeKeyScrollingAction.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.fbreader.fbreader;
 
-import org.geometerplus.zlibrary.text.view.ZLTextView;
-
 class VolumeKeyScrollingAction extends FBAction {
 	private final boolean myForward;
 

src/org/geometerplus/fbreader/formats/FormatPlugin.java

@@ -19,14 +19,9 @@
 
 package org.geometerplus.fbreader.formats;
 
-import java.io.*;
-import java.util.*;
-
 import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.library.Book;
-import org.geometerplus.zlibrary.core.dialogs.ZLOptionsDialog;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
-import org.geometerplus.zlibrary.core.language.ZLLanguageDetector;
 
 public abstract class FormatPlugin {
 	public abstract boolean acceptsFile(ZLFile file);

src/org/geometerplus/fbreader/formats/PluginCollection.java

@@ -25,7 +25,6 @@ import org.geometerplus.zlibrary.core.options.*;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 
 import org.geometerplus.fbreader.formats.fb2.FB2Plugin;
-import org.geometerplus.fbreader.formats.html.HtmlPlugin;
 import org.geometerplus.fbreader.formats.oeb.OEBPlugin;
 import org.geometerplus.fbreader.formats.pdb.MobipocketPlugin;
 

src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java

@@ -22,7 +22,6 @@ package org.geometerplus.fbreader.formats.fb2;
 import java.util.*;
 
 import org.geometerplus.zlibrary.core.library.ZLibrary;
-import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.fbreader.bookmodel.*;
 import org.geometerplus.zlibrary.core.xml.*;
 import org.geometerplus.zlibrary.core.util.*;

src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java

@@ -20,7 +20,6 @@
 package org.geometerplus.fbreader.formats.fb2;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 final class FB2Tag {
 	public static final byte UNKNOWN = 0;
@@ -59,9 +58,9 @@ final class FB2Tag {
 	public static final byte LAST_NAME = 32;
 	public static final byte SEQUENCE = 33;
 	public static final byte GENRE = 34;
-	
+
-	
+
-	private static final HashMap ourTagByName = new HashMap(256, 0.2f);
+	private static final HashMap<String,Byte> ourTagByName = new HashMap<String,Byte>(256, 0.2f);
 	private static final Byte ourUnknownTag;
 
 	static {	
@@ -105,8 +104,8 @@ final class FB2Tag {
 	}
 
 	public static byte getTagByName(String name) {
-		final HashMap tagByName = ourTagByName;
+		final HashMap<String,Byte> tagByName = ourTagByName;
-		Byte num = (Byte)tagByName.get(name);
+		Byte num = tagByName.get(name);
 		if (num == null) {
 			final String upperCaseName = name.toLowerCase().intern();
 			num = (Byte)tagByName.get(upperCaseName);

src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java

@@ -20,9 +20,7 @@
 package org.geometerplus.fbreader.formats.fb2;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
 import org.geometerplus.zlibrary.core.xml.*;
 

src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java

@@ -27,7 +27,6 @@ import org.geometerplus.fbreader.formats.FormatPlugin;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 
 public class HtmlPlugin extends FormatPlugin {
-	private final static String AUTO = "auto";
 	
 	@Override
 	public boolean acceptsFile(ZLFile file) {

src/org/geometerplus/fbreader/formats/html/HtmlReader.java

@@ -26,9 +26,7 @@ import java.nio.charset.*;
 import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.bookmodel.BookReader;
 import org.geometerplus.fbreader.bookmodel.FBTextKind;
-import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.html.*;
-import org.geometerplus.zlibrary.core.image.ZLFileImage;
 import org.geometerplus.zlibrary.core.util.ZLArrayUtils;
 import org.geometerplus.zlibrary.text.model.ZLTextParagraph;
 
@@ -64,10 +62,8 @@ public class HtmlReader extends BookReader implements ZLHtmlReader {
 	private byte myHyperlinkType;
 	private final char[] SPACE = { ' ' };
 	private String myHrefAttribute = "href";
-	private String mySrcAttribute = "src";
-	private boolean myAdditionalParagraphExists = false;
 	private boolean myOrderedListIsStarted = false;
-	private boolean myUnorderedListIsStarted = false;
+	//private boolean myUnorderedListIsStarted = false;
 	private int myOLCounter = 0;
 	private byte[] myControls = new byte[10];
 	private byte myControlsNumber = 0;
@@ -75,7 +71,7 @@ public class HtmlReader extends BookReader implements ZLHtmlReader {
 	public HtmlReader(BookModel model) throws UnsupportedEncodingException {
 		super(model);
 		try {	
-			String encoding = model.Book.getEncoding();
+			//String encoding = model.Book.getEncoding();
 			myAttributeDecoder = createDecoder();
 			setByteDecoder(createDecoder());
 		} catch (UnsupportedCharsetException e) {
@@ -225,7 +221,7 @@ public class HtmlReader extends BookReader implements ZLHtmlReader {
 				break;
 				
 			case HtmlTag.UL:
-				myUnorderedListIsStarted = false;
+				//myUnorderedListIsStarted = false;
 				break;
 				
 			default:
@@ -318,7 +314,7 @@ public class HtmlReader extends BookReader implements ZLHtmlReader {
 				break;
 				
 			case HtmlTag.UL:
-				myUnorderedListIsStarted = true;
+				//myUnorderedListIsStarted = true;
 				break;
 				
 			case HtmlTag.LI:

src/org/geometerplus/fbreader/formats/html/HtmlTag.java

@@ -20,7 +20,6 @@
 package org.geometerplus.fbreader.formats.html;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 public final class HtmlTag {
 	public static final byte UNKNOWN = 0;
@@ -67,7 +66,7 @@ public final class HtmlTag {
 
 	public static final byte TAG_NUMBER = 37;
 	
-	private static final HashMap ourTagByName = new HashMap(256, 0.2f);
+	private static final HashMap<String,Byte> ourTagByName = new HashMap<String,Byte>(256, 0.2f);
 	private static final Byte ourUnknownTag;
 
 	static {
@@ -111,8 +110,8 @@ public final class HtmlTag {
 	}
 
 	public static byte getTagByName(String name) {
-		final HashMap tagByName = ourTagByName;
+		final HashMap<String,Byte> tagByName = ourTagByName;
-		Byte num = (Byte)tagByName.get(name);
+		Byte num = tagByName.get(name);
 		if (num == null) {
 			final String lowerCaseName = name.toLowerCase().intern();
 			num = (Byte)tagByName.get(lowerCaseName);

src/org/geometerplus/fbreader/formats/oeb/NCXReader.java

@@ -40,7 +40,6 @@ class NCXReader extends ZLXMLReaderAdapter {
 		}
 	}
 
-	private final BookReader myModelReader;
 	private final TreeMap<Integer,NavPoint> myNavigationMap = new TreeMap<Integer,NavPoint>();
 	private final ArrayList<NavPoint> myPointStack = new ArrayList<NavPoint>();
 
@@ -55,7 +54,6 @@ class NCXReader extends ZLXMLReaderAdapter {
 	private String myLocalPathPrefix;
 
 	NCXReader(BookReader modelReader) {
-		myModelReader = modelReader;
 	}
 
 	boolean readFile(String filePath) {

src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java

@@ -61,7 +61,6 @@ class OEBBookReader extends ZLXMLReaderAdapter implements XMLNamespace {
 	private TreeMap<String,Integer> myTOCLabels = new TreeMap<String,Integer>();
 
 	boolean readBook(ZLFile file) {
-		long start = System.currentTimeMillis();
 		myFilePrefix = MiscUtil.htmlDirectoryPrefix(file);
 
 		myIdToHref.clear();

src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.fbreader.formats.oeb;
 
-import java.util.ArrayList;
-
 import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.library.Book;
 import org.geometerplus.fbreader.formats.FormatPlugin;

src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java

@@ -35,8 +35,6 @@ public abstract class PdbPlugin extends FormatPlugin {
 	}
 
 	protected static String fileType(final ZLFile file) {
-		ZLFile baseFile = file.getPhysicalFile();
-
 		// TODO: use database instead of option (?)
 		ZLStringOption palmTypeOption = new ZLStringOption(file.getPath(), "PalmType", "");
 		String palmType = palmTypeOption.getValue();

src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java

@@ -24,7 +24,6 @@ import java.io.InputStream;
 
 import org.geometerplus.fbreader.formats.pdb.DocDecompressor;
 import org.geometerplus.zlibrary.core.image.ZLSingleImage;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 
 public class DocCompressedFileImage extends ZLSingleImage {

src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java

@@ -24,7 +24,6 @@ import java.io.IOException;
 import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.library.Book;
 import org.geometerplus.fbreader.formats.pdb.PdbPlugin;
-import org.geometerplus.fbreader.formats.pdb.PdbStream;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 
 public class PluckerPlugin extends PdbPlugin {

src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java

@@ -26,7 +26,6 @@ import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
 
 import org.geometerplus.zlibrary.core.image.ZLSingleImage;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 
 public class ZCompressedFileImage extends ZLSingleImage {
@@ -48,7 +47,7 @@ public class ZCompressedFileImage extends ZLSingleImage {
 				return new byte[0];
 			}
 			
-			final ArrayList data = new ArrayList();
+			final ArrayList<byte[]> data = new ArrayList<byte[]>();
 			byte[] buffer;
 			int sizeOfBufferData;
 

src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java

@@ -20,9 +20,7 @@
 package org.geometerplus.fbreader.formats.xhtml;
 
 import java.util.*;
-import java.io.InputStream;
 
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.xml.*;
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 
@@ -30,7 +28,7 @@ import org.geometerplus.fbreader.bookmodel.*;
 import org.geometerplus.fbreader.formats.util.MiscUtil;
 
 public class XHTMLReader extends ZLXMLReaderAdapter {
-	private static final HashMap ourTagActions = new HashMap();
+	private static final HashMap<String,XHTMLTagAction> ourTagActions = new HashMap<String,XHTMLTagAction>();
 
 	public static XHTMLTagAction addAction(String tag, XHTMLTagAction action) {
 		XHTMLTagAction old = (XHTMLTagAction)ourTagActions.get(tag);

src/org/geometerplus/fbreader/library/Author.java

@@ -19,9 +19,6 @@
 
 package org.geometerplus.fbreader.library;
 
-import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
-
 public final class Author {
 	public final String DisplayName;
 	public final String SortKey;

src/org/geometerplus/fbreader/library/Library.java

@@ -23,7 +23,6 @@ import java.io.File;
 import java.util.*;
 
 import org.geometerplus.zlibrary.core.filesystem.*;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.fbreader.Paths;
 
 public final class Library {
@@ -121,7 +120,7 @@ public final class Library {
 	}
 
 	private void collectBooks() {
-		final long start = System.currentTimeMillis();
+		//final long start = System.currentTimeMillis();
 		//android.os.Debug.startMethodTracing("/sdcard/ll0");
 		final List<ZLPhysicalFile> physicalFilesList = collectPhysicalFiles();
 		//android.os.Debug.stopMethodTracing();

src/org/geometerplus/fbreader/network/NetworkBookItem.java

@@ -107,7 +107,7 @@ public final class NetworkBookItem extends NetworkLibraryItem {
 		Tags = new LinkedList<String>(tags);
 		SeriesTitle = seriesTitle;
 		IndexInSeries = indexInSeries;
-		myReferences = new LinkedList(references);
+		myReferences = new LinkedList<BookReference>(references);
 	}
 
 	public BookReference reference(int type) {

src/org/geometerplus/fbreader/network/NetworkImage.java

@@ -23,7 +23,6 @@ import java.io.*;
 import java.net.*;
 
 import org.geometerplus.zlibrary.core.image.ZLSingleImage;
-import org.geometerplus.zlibrary.core.util.ZLNetworkUtil;
 import org.geometerplus.zlibrary.core.network.*;
 
 import org.geometerplus.fbreader.Paths;

src/org/geometerplus/fbreader/network/NetworkLink.java

@@ -60,7 +60,7 @@ abstract public class NetworkLink {
 		Summary = summary;
 		Icon = icon;
 		OnOption = new ZLBooleanOption(SiteName, "on", true);
-		Links = new TreeMap(links);
+		Links = new TreeMap<String, String>(links);
 	}
 
 	public abstract ZLNetworkRequest simpleSearchRequest(String pattern, NetworkOperationData data);

src/org/geometerplus/fbreader/network/authentication/NetworkAuthenticationManager.java

@@ -20,7 +20,6 @@
 package org.geometerplus.fbreader.network.authentication;
 
 import org.geometerplus.zlibrary.core.options.ZLStringOption;
-import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
 
 import org.geometerplus.fbreader.network.*;
 

src/org/geometerplus/fbreader/network/authentication/litres/LitResGenreMap.java

@@ -19,14 +19,13 @@
 
 package org.geometerplus.fbreader.network.authentication.litres;
 
-import java.util.LinkedList;
+/*import java.util.LinkedList;
 import java.util.HashMap;
 
 class LitResGenreMap {
 
 	private static LitResGenreMap ourInstance;
 
-	private boolean myInitialized;
 	LinkedList<LitResGenre> myGenresTree;
 	HashMap<String, LitResGenre> myGenresMap;
 	HashMap<LitResGenre, String> myGenresTitles;
@@ -41,3 +40,4 @@ class LitResGenreMap {
 	private LitResGenreMap() {
 	}
 }
+*/

src/org/geometerplus/fbreader/network/authentication/litres/LitResXMLReader.java

@@ -36,8 +36,8 @@ class LitResXMLReader extends LitResAuthenticationXMLReader {
 
 	private String myBookId;
 	private String myTitle;
-	private String myLanguage;
+	//private String myLanguage;
-	private String myDate;
+	//private String myDate;
 	private String mySeriesTitle;
 	private int myIndexInSeries;
 
@@ -233,7 +233,7 @@ class LitResXMLReader extends LitResAuthenticationXMLReader {
 					myReferences
 				));
 
-				myBookId = myTitle = myLanguage = myDate = mySeriesTitle = mySummary = myCover = null;
+				myBookId = myTitle = /*myLanguage = myDate = */mySeriesTitle = mySummary = myCover = null;
 				myIndexInSeries = 0;
 				myAuthors.clear();
 				myTags.clear();
@@ -329,13 +329,13 @@ class LitResXMLReader extends LitResAuthenticationXMLReader {
 			break;
 		case DATE:
 			if (TAG_DATE == tag) {
-				myDate = bufferContent;
+				//myDate = bufferContent;
 				myState = TITLE_INFO;
 			}
 			break;
 		case LANGUAGE:
 			if (TAG_LANGUAGE == tag) {
-				myLanguage = bufferContent;
+				//myLanguage = bufferContent;
 				myState = TITLE_INFO;
 			}
 			break;

src/org/geometerplus/fbreader/network/opds/NetworkOPDSFeedReader.java

@@ -149,12 +149,12 @@ class NetworkOPDSFeedReader implements OPDSFeedReader {
 
 	private NetworkLibraryItem readBookItem(OPDSEntry entry) {
 		final OPDSLink opdsLink = (OPDSLink) myData.Link;
-		final String date;
+		/*final String date;
 		if (entry.DCIssued != null) {
 			date = entry.DCIssued.getDateTime(true);
 		} else {
 			date = null;
-		}
+		}*/
 
 		final LinkedList<String> tags = new LinkedList<String>();
 		for (ATOMCategory category: entry.Categories) {

src/org/geometerplus/fbreader/network/opds/OPDSLink.java

@@ -51,7 +51,7 @@ class OPDSLink extends NetworkLink {
 
 	final void setRelationAliases(Map<RelationAlias, String> relationAliases) {
 		if (relationAliases != null && relationAliases.size() > 0) {
-			myRelationAliases = new TreeMap(relationAliases);
+			myRelationAliases = new TreeMap<RelationAlias, String>(relationAliases);
 		} else {
 			myRelationAliases = null;
 		}
@@ -59,7 +59,7 @@ class OPDSLink extends NetworkLink {
 
 	final void setUrlConditions(Map<String, Integer> conditions) {
 		if (conditions != null && conditions.size() > 0) {
-			myUrlConditions = new TreeMap(conditions);
+			myUrlConditions = new TreeMap<String, Integer>(conditions);
 		} else {
 			myUrlConditions = null;
 		}
@@ -67,7 +67,7 @@ class OPDSLink extends NetworkLink {
 
 	final void setUrlRewritingRules(List<URLRewritingRule> rules) {
 		if (rules != null && rules.size() > 0) {
-			myUrlRewritingRules = new LinkedList(rules);
+			myUrlRewritingRules = new LinkedList<URLRewritingRule>(rules);
 		} else {
 			myUrlRewritingRules = null;
 		}

src/org/geometerplus/fbreader/network/opds/OPDSLinkReader.java

@@ -41,7 +41,7 @@ public class OPDSLinkReader extends ZLXMLReaderAdapter {
 
 	private HashMap<RelationAlias, String> myRelationAliases = new HashMap<RelationAlias, String>();
 
-	private String mySearchType;
+	//private String mySearchType;
 	private final HashMap<String, String> mySearchFields = new HashMap<String, String>();
 
 	private final HashMap<String, Integer> myUrlConditions = new HashMap<String, Integer>();
@@ -88,7 +88,7 @@ public class OPDSLinkReader extends ZLXMLReaderAdapter {
 	}
 
 	public NetworkLink readDocument(ZLFile file) {
-		mySiteName = myTitle = mySummary = myIcon = mySearchType = myAuthenticationType = mySSLCertificate = null;
+		mySiteName = myTitle = mySummary = myIcon = /*mySearchType = */myAuthenticationType = mySSLCertificate = null;
 		myLinks.clear();
 		mySearchFields.clear();
 		myUrlConditions.clear();
@@ -168,7 +168,7 @@ public class OPDSLinkReader extends ZLXMLReaderAdapter {
 		} else if (TAG_SEARCH_DESCRIPTION == tag) {
 			String searchType = attributes.getValue("style");
 			if (searchType != null) {
-				mySearchType = searchType;
+				//mySearchType = searchType;
 				myState = READ_SEARCH_DESCRIPTION;
 			}
 		} else if (myState == READ_SEARCH_DESCRIPTION && TAG_FIELD == tag) {

src/org/geometerplus/fbreader/network/tree/NetworkBookTree.java

@@ -19,11 +19,8 @@
 
 package org.geometerplus.fbreader.network.tree;
 
-import java.util.*;
-
 import org.geometerplus.zlibrary.core.image.ZLImage;
 
-import org.geometerplus.fbreader.tree.FBTree;
 import org.geometerplus.fbreader.network.*;
 
 

src/org/geometerplus/fbreader/network/tree/NetworkCatalogRootTree.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.fbreader.network.tree;
 
-import java.util.*;
-
 import org.geometerplus.fbreader.network.*;
 
 public class NetworkCatalogRootTree extends NetworkCatalogTree {

src/org/geometerplus/fbreader/network/tree/NetworkTreeFactory.java

@@ -19,11 +19,8 @@
 
 package org.geometerplus.fbreader.network.tree;
 
-import java.util.*;
-
 import org.geometerplus.zlibrary.core.util.ZLBoolean3;
 
-import org.geometerplus.fbreader.tree.FBTree;
 import org.geometerplus.fbreader.network.*;
 
 public class NetworkTreeFactory {

src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java

@@ -20,10 +20,8 @@
 package org.geometerplus.fbreader.optionsDialog;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.Map;
 import java.util.Map.Entry;
 
 import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry;
@@ -31,7 +29,7 @@ import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry;
 
 class ComboOptionEntry extends ZLComboOptionEntry {
 	protected final OptionsPage myPage;
-	protected final ArrayList /*<std::string>*/ myValues = new ArrayList();
+	protected final ArrayList<String> myValues = new ArrayList<String>();
 	protected String myInitialValue;
 	
 	public ComboOptionEntry(final OptionsPage myPage, String myInitialValue) {
@@ -39,7 +37,7 @@ class ComboOptionEntry extends ZLComboOptionEntry {
 		this.myInitialValue = myInitialValue;
 	}
 
-	public ArrayList getValues() {
+	public ArrayList<String> getValues() {
 		return myValues;
 	}
 
@@ -49,13 +47,15 @@ class ComboOptionEntry extends ZLComboOptionEntry {
 
 	public void onAccept(String value) {}
 
+	@Override
 	public void onReset() {
 		onValueSelected(0);
 	}
 
+	@Override
 	public void onValueSelected(int index) {
 		final Object selectedValue = myValues.get(index);
-		final LinkedHashMap /*<ZLOptionEntry*,std::string>*/ entries = myPage.getEntries();
+		final LinkedHashMap<ZLOptionEntry, String> entries = myPage.getEntries();
 /*		for (Iterator it = entries.keySet().iterator(); it.hasNext(); ) {
 			ZLOptionEntry entry = (ZLOptionEntry) it.next();
 			entry.setVisible(selectedValue != null && selectedValue.equals(entries.get(entry)));
@@ -63,12 +63,12 @@ class ComboOptionEntry extends ZLComboOptionEntry {
 				System.out.println(entry.getKind()+" "+entry.hashCode());
 		} 
 	*/
-		for (Iterator it = entries.entrySet().iterator(); it.hasNext(); ) {
+		for (Iterator<Entry<ZLOptionEntry, String>> it = entries.entrySet().iterator(); it.hasNext(); ) {
-			Entry entry = (Entry) it.next();
+			Entry<ZLOptionEntry, String> entry = it.next();
-			((ZLOptionEntry) entry.getKey()).setVisible(selectedValue != null && selectedValue.equals(entry.getValue()));
+			entry.getKey().setVisible(selectedValue != null && selectedValue.equals(entry.getValue()));
 		} 
 	}
-	
+
 	public void addValue(final String value) {
 		myValues.add(value);
 	}

src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java

@@ -22,12 +22,10 @@ package org.geometerplus.fbreader.optionsDialog;
 import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.dialogs.*;
 import org.geometerplus.zlibrary.core.optionEntries.*;
-import org.geometerplus.zlibrary.core.options.*;
+//import org.geometerplus.zlibrary.core.options.*;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
-import org.geometerplus.zlibrary.text.view.style.*;
 
 import org.geometerplus.fbreader.fbreader.*;
-import org.geometerplus.fbreader.formats.PluginCollection;
 
 public class OptionsDialog {
 	private ZLOptionsDialog myDialog;
@@ -81,7 +79,7 @@ public class OptionsDialog {
 		}
 	}
 	
-	private static class StateOptionEntry extends ZLToggleBooleanOptionEntry {
+	/*private static class StateOptionEntry extends ZLToggleBooleanOptionEntry {
 		private boolean myState;
 		
 		public StateOptionEntry(ZLBooleanOption option) {
@@ -111,5 +109,5 @@ public class OptionsDialog {
 					(mySecond.isVisible() && mySecond.myState)
 			);
 		}	
-	}
+	}*/
 }

src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java

@@ -24,9 +24,9 @@ import java.util.*;
 import org.geometerplus.zlibrary.core.dialogs.*;
 
 class OptionsPage {
-	private final LinkedHashMap /*<ZLOptionEntry, String>*/ myEntries = new LinkedHashMap();
+	private final LinkedHashMap<ZLOptionEntry, String> myEntries = new LinkedHashMap<ZLOptionEntry, String>();
 	protected ComboOptionEntry myComboEntry;
-	
+
 	protected OptionsPage() {
 	}
 
@@ -51,7 +51,7 @@ class OptionsPage {
 		tab.addOptions(entry0Key, entry0, entry1Key, entry1);
 	}
 
-	LinkedHashMap getEntries() {
+	LinkedHashMap<ZLOptionEntry, String> getEntries() {
 		return myEntries;
 	}
 }

src/org/geometerplus/zlibrary/core/application/ZLApplication.java

@@ -20,12 +20,8 @@
 package org.geometerplus.zlibrary.core.application;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 import org.geometerplus.zlibrary.core.filesystem.*;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
-import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
-import org.geometerplus.zlibrary.core.options.ZLIntegerOption;
 import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.view.ZLView;
@@ -39,8 +35,8 @@ public abstract class ZLApplication {
 
 	private static ZLApplication ourInstance;
 
-	private static final String MouseScrollUpKey = "<MouseScrollDown>";
+	//private static final String MouseScrollUpKey = "<MouseScrollDown>";
-	private static final String MouseScrollDownKey = "<MouseScrollUp>";
+	//private static final String MouseScrollDownKey = "<MouseScrollUp>";
 	public static final String NoAction = "none";
 	
 	public final ZLIntegerRangeOption KeyDelayOption =
@@ -218,7 +214,7 @@ public abstract class ZLApplication {
 		public interface Item {
 		}
 
-		private final ArrayList myItems = new ArrayList();
+		private final ArrayList<Item> myItems = new ArrayList<Item>();
 		private final ZLResource myResource;
 
 		Menu(ZLResource resource) {
@@ -317,17 +313,19 @@ public abstract class ZLApplication {
 		private static final String ITEM = "item";
 		private static final String SUBMENU = "submenu";
 
-		private final ArrayList mySubmenuStack = new ArrayList();
+		private final ArrayList<Menubar.Submenu> mySubmenuStack = new ArrayList<Menubar.Submenu>();
 
+		@Override
 		public boolean dontCacheAttributeValues() {
 			return true;
 		}
 
+		@Override
 		public boolean startElementHandler(String tag, ZLStringMap attributes) {
 			if (myMenubar == null) {
 				myMenubar = new Menubar();
 			}
-			final ArrayList stack = mySubmenuStack;
+			final ArrayList<Menubar.Submenu> stack = mySubmenuStack;
 			final Menu menu = stack.isEmpty() ? myMenubar : (Menu)stack.get(stack.size() - 1);
 			if (ITEM == tag) {
 				final String id = attributes.getValue("id");
@@ -343,9 +341,10 @@ public abstract class ZLApplication {
 			return false;
 		}
 
+		@Override
 		public boolean endElementHandler(String tag) {
 			if (SUBMENU == tag) {
-				final ArrayList stack = mySubmenuStack;
+				final ArrayList<Menubar.Submenu> stack = mySubmenuStack;
 				if (!stack.isEmpty()) {
 					stack.remove(stack.size() - 1);
 				}

src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java

@@ -19,9 +19,6 @@
 
 package org.geometerplus.zlibrary.core.application;
 
-import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
-
 abstract public class ZLApplicationWindow {
 	private ZLApplication myApplication;
 

src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java

@@ -20,11 +20,7 @@
 package org.geometerplus.zlibrary.core.application;
 
 import java.util.*;
-import java.util.Map.Entry;
 
-import org.geometerplus.zlibrary.core.util.*;
-
-import org.geometerplus.zlibrary.core.options.ZLIntegerOption;
 import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;
 import org.geometerplus.zlibrary.core.options.ZLStringOption;
 
@@ -34,7 +30,7 @@ public final class ZLKeyBindings {
 	private static final String BINDED_ACTION = "Action";
 
 	private final String myName;
-	private final HashMap myBindingsMap = new HashMap();
+	private final HashMap<String, String> myBindingsMap = new HashMap<String, String>();
 	private	boolean myIsChanged;
 
 	public ZLKeyBindings(String name) {
@@ -78,15 +74,15 @@ public final class ZLKeyBindings {
 		if (!myIsChanged) {
 			return;
 		}
-		
+
-		final HashMap keymap = new HashMap();
+		final HashMap<String, String> keymap = new HashMap<String, String>();
 		new ZLKeyBindingsReader(keymap).readBindings();
-		
+
 		int counter = 0;
-		for (Iterator it = myBindingsMap.keySet().iterator(); it.hasNext(); ) {
+		for (Iterator<String> it = myBindingsMap.keySet().iterator(); it.hasNext(); ) {
-			final String key = (String)it.next();
+			final String key = it.next();
-			final String originalValue = (String)keymap.get(key);
+			final String originalValue = keymap.get(key);
-			final String value = (String)myBindingsMap.get(key);
+			final String value = myBindingsMap.get(key);
 			if (!value.equals(originalValue)) {
 				new ZLStringOption(myName, BINDED_KEY + counter, "").setValue(key);
 				new ZLStringOption(myName, BINDED_ACTION + counter, "").setValue(value);

src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java

@@ -20,22 +20,24 @@
 package org.geometerplus.zlibrary.core.application;
 
 import java.util.*;
+
 import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.xml.ZLStringMap;
 import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter;
 
 class ZLKeyBindingsReader extends ZLXMLReaderAdapter {
-	private final HashMap myKeymap;
+	private final HashMap<String, String> myKeymap;
-	
+
+	@Override
 	public boolean dontCacheAttributeValues() {
 		return true;
 	}
 
-	public ZLKeyBindingsReader(HashMap keymap) {
+	public ZLKeyBindingsReader(HashMap<String, String> keymap) {
 		myKeymap = keymap; 
 	}
-		
+
+	@Override
 	public boolean startElementHandler(String tag, ZLStringMap attributes) {
 		if ("binding".equals(tag)) {
 			final String key = attributes.getValue("key");

src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java

@@ -20,46 +20,45 @@
 package org.geometerplus.zlibrary.core.dialogs;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 public abstract class ZLComboOptionEntry extends ZLOptionEntry {
 	private final boolean myEditable;
-	
+
 	protected ZLComboOptionEntry() {
 		myEditable = false;
 	}
-	
+
 	protected ZLComboOptionEntry(boolean editable) {
 		myEditable = editable;
 	}
-	
+
 	public int getKind() {
 		return ZLOptionKind.COMBO;
 	}
-	
+
 	public void onValueSelected(int index) {}
-	
+
 	public final void onStringValueSelected(String value) {
 		int index = getValues().indexOf(value);
 		if (index != -1) {
 			onValueSelected(index);
 		}
 	}
-	
+
 	public boolean useOnValueEdited() {
 		return false;
 	}
-	
+
 	public void onValueEdited(String value) {}
-	
+
 	public final boolean isEditable() {
 		return myEditable;
 	}
-	
+
 	public abstract String initialValue();
-	
+
-	public abstract ArrayList/*<String>*/ getValues();
+	public abstract ArrayList<String> getValues();
-	
+
 	public abstract void onAccept(String value);
 
 	public void onReset() {

src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java

@@ -21,8 +21,6 @@ package org.geometerplus.zlibrary.core.dialogs;
 
 import java.util.*;
 
-import org.geometerplus.zlibrary.core.util.*;
-
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBoolean3OptionEntry;
 import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBooleanOptionEntry;
@@ -31,8 +29,8 @@ import org.geometerplus.zlibrary.core.options.*;
 
 public abstract class ZLDialogContent {
 	private final ZLResource myResource;
-	protected final ArrayList Views = new ArrayList();
+	protected final ArrayList<ZLOptionView> Views = new ArrayList<ZLOptionView>();
-	
+
 	private static ZLOptionEntry createEntryByOption(ZLSimpleOption option) {
 		switch (option.getType()) {
 		case ZLSimpleOption.Type.BOOLEAN:
@@ -91,14 +89,14 @@ public abstract class ZLDialogContent {
 	protected final void accept() {
 		final int size = Views.size();
 		for (int i = 0; i < size; i++) {
-			((ZLOptionView)Views.get(i)).onAccept();
+			Views.get(i).onAccept();
 		}
 	}
 
 	final void reset() {
 		final int size = Views.size();
 		for (int i = 0; i < size; i++) {
-			((ZLOptionView)Views.get(i)).reset();
+			Views.get(i).reset();
 		}
 	}
 

src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java

@@ -20,10 +20,9 @@
 package org.geometerplus.zlibrary.core.dialogs;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 public abstract class ZLKeyOptionEntry extends ZLOptionEntry {
-	private final ArrayList/*<String>*/ myActionNames = new ArrayList();
+	private final ArrayList<String> myActionNames = new ArrayList<String>();
 
 	public ZLKeyOptionEntry() {}
 
@@ -35,7 +34,7 @@ public abstract class ZLKeyOptionEntry extends ZLOptionEntry {
 		myActionNames.add(actionName);
 	}
 
-	public final ArrayList getActionNames() {
+	public final ArrayList<String> getActionNames() {
 		return myActionNames;
 	}
 

src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java

@@ -20,14 +20,13 @@
 package org.geometerplus.zlibrary.core.dialogs;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 import org.geometerplus.zlibrary.core.options.*;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 public abstract class ZLOptionsDialog {
 	private final ZLResource myResource;
-	protected final ArrayList /*ZLDialogContent*/ myTabs = new ArrayList();
+	protected final ArrayList<ZLDialogContent> myTabs = new ArrayList<ZLDialogContent>();
 	protected Runnable myExitAction;
 	protected Runnable myApplyAction;
 	protected ZLStringOption myTabOption;
@@ -53,7 +52,7 @@ public abstract class ZLOptionsDialog {
 	protected void accept() {
 		final int size = myTabs.size();
 		for (int i = 0; i < size; i++) {
-			((ZLDialogContent)myTabs.get(i)).accept();
+			myTabs.get(i).accept();
 		}
 		if (myApplyAction != null) {
 			myApplyAction.run();

src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java

@@ -19,8 +19,7 @@
 
 package org.geometerplus.zlibrary.core.dialogs;
 
-import java.util.*;
+/*import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 public abstract class ZLOrderOptionEntry extends ZLOptionEntry {
 	private final ArrayList myValues = new ArrayList();
@@ -36,3 +35,4 @@ public abstract class ZLOrderOptionEntry extends ZLOptionEntry {
 		return myValues;
 	}
 }
+*/

src/org/geometerplus/zlibrary/core/encoding/ZLEncodingCollection.java

@@ -22,7 +22,6 @@ package org.geometerplus.zlibrary.core.encoding;
 import java.util.HashMap;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.xml.ZLStringMap;
 import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter;
 

src/org/geometerplus/zlibrary/core/filesystem/ZLPhysicalFile.java

@@ -22,8 +22,6 @@ package org.geometerplus.zlibrary.core.filesystem;
 import java.util.*;
 import java.io.*;
 
-import org.geometerplus.zlibrary.core.library.ZLibrary;
-
 public final class ZLPhysicalFile extends ZLFile {
 	private final File myFile;
 	

src/org/geometerplus/zlibrary/core/filesystem/ZLResourceFile.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.zlibrary.core.filesystem;
 
-import java.io.*;
-
 import org.geometerplus.zlibrary.core.library.ZLibrary;
 
 public abstract class ZLResourceFile extends ZLFile {

src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarInputStream.java

@@ -24,11 +24,11 @@ import java.io.IOException;
 
 class ZLTarInputStream extends InputStream {
 	private final InputStream myBase;
-	private final String myFileName;
+	//private final String myFileName;
 
 	ZLTarInputStream(InputStream base, String fileName) throws IOException {
 		myBase = base;
-		myFileName = fileName;
+		//myFileName = fileName;
 
 		ZLTarHeader header = new ZLTarHeader();
 		while (header.read(myBase)) {
@@ -51,18 +51,22 @@ class ZLTarInputStream extends InputStream {
 		return myBase.read();
 	}
 
+	@Override
 	public int read(byte b[]) throws IOException {
 		return myBase.read(b);
 	}
 
+	@Override
 	public int read(byte b[], int off, int len) throws IOException {
 		return myBase.read(b, off, len);
 	}
 
+	@Override
 	public long skip(long n) throws IOException {
 		return myBase.skip(n);
 	}
 
+	@Override
 	public int available() throws IOException {
 		return myBase.available();
 	}

src/org/geometerplus/zlibrary/core/html/ZLHtmlAttributeMap.java

@@ -21,8 +21,6 @@ package org.geometerplus.zlibrary.core.html;
 
 import java.nio.charset.CharsetDecoder;
 
-import org.geometerplus.zlibrary.core.util.ZLArrayUtils;
-
 // optimized partially implemented map ZLByteBuffer -> ZLByteBuffer
 // there is no remove() in this implementation
 // put with the same key does not remove old entry

src/org/geometerplus/zlibrary/core/html/ZLHtmlParser.java

@@ -21,7 +21,6 @@ package org.geometerplus.zlibrary.core.html;
 
 import java.io.*;
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 import org.geometerplus.zlibrary.core.util.ZLArrayUtils;
 import org.geometerplus.zlibrary.core.html.ZLHtmlReader;
@@ -31,8 +30,8 @@ final class ZLHtmlParser {
 	private static final byte START_TAG = 1;
 	private static final byte END_TAG = 2;
 	private static final byte TEXT = 3;
-	private static final byte IGNORABLE_WHITESPACE = 4;
+	//private static final byte IGNORABLE_WHITESPACE = 4;
-	private static final byte PROCESSING_INSTRUCTION = 5;
+	//private static final byte PROCESSING_INSTRUCTION = 5;
 	private static final byte COMMENT = 6;
 	private static final byte LANGLE = 7;
 	private static final byte WS_AFTER_START_TAG_NAME = 8;
@@ -77,7 +76,7 @@ final class ZLHtmlParser {
 		final HashMap<ZLByteBuffer,ZLByteBuffer> strings = new HashMap<ZLByteBuffer,ZLByteBuffer>();
 		final ZLHtmlAttributeMap attributes = new ZLHtmlAttributeMap();
 		boolean scriptOpened = false;
-		boolean html = false;
+		//boolean html = false;
 		int bufferOffset = 0;
 		int offset = 0;
 		
@@ -191,9 +190,9 @@ mainSwitchLabel:
 												state = SCRIPT;
 												break mainSwitchLabel;
 											}
-											if (stringTagName.equalsToLCString("html")) {
+											/*if (stringTagName.equalsToLCString("html")) {
 												html = true;
-											}
+											}*/
 										}
 										startPosition = i + 1;
 										break mainSwitchLabel;

src/org/geometerplus/zlibrary/core/image/ZLImageMap.java

@@ -20,9 +20,10 @@
 package org.geometerplus.zlibrary.core.image;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
-public final class ZLImageMap extends HashMap {
+public final class ZLImageMap extends HashMap<String,ZLImage> {
+	private static final long serialVersionUID = -4488377408233803199L;
+
 	public ZLImage getImage(String id) {
 		return (ZLImage)super.get(id);
 	}

src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java

@@ -27,8 +27,8 @@ import org.geometerplus.zlibrary.core.language.ZLLanguageMatcher.ZLWordBasedMatc
 import org.geometerplus.zlibrary.core.util.ZLUnicodeUtil;
 
 public class ZLLanguageDetector {
-	private ArrayList myUtf8Matchers = new ArrayList();
+	private ArrayList<ZLWordBasedMatcher> myUtf8Matchers = new ArrayList<ZLWordBasedMatcher>();
-	private	ArrayList myNonUtf8Matchers = new ArrayList();
+	private	ArrayList<ZLWordBasedMatcher> myNonUtf8Matchers = new ArrayList<ZLWordBasedMatcher>();
 	//private	ArrayList<ZLChineseMatcher> myChineseMatchers;
 
 	// 0: no break
@@ -137,8 +137,8 @@ public class ZLLanguageDetector {
 						}
 						String str = new String(buffer); 
 						word += str.substring(wordStart,wordStart + ptr - wordStart);	
-						for (Iterator it = wbMatchers.iterator(); it.hasNext(); ) {
+						for (Iterator<ZLWordBasedMatcher> it = wbMatchers.iterator(); it.hasNext(); ) {
-							((ZLWordBasedMatcher)it.next()).processWord(word, length2);
+							it.next().processWord(word, length2);
 						}
 						word = "";
 					}
@@ -157,8 +157,8 @@ public class ZLLanguageDetector {
 
 		LanguageInfo info = null;
 		
-		for (Iterator it = wbMatchers.iterator(); it.hasNext(); ) {
+		for (Iterator<ZLWordBasedMatcher> it = wbMatchers.iterator(); it.hasNext(); ) {
-			ZLWordBasedMatcher itzl = (ZLWordBasedMatcher)it.next();
+			ZLWordBasedMatcher itzl = it.next();
 			int criterion = itzl.criterion();
 			if (criterion > matchingCriterion) {
 				info = itzl.info();

src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java

@@ -19,22 +19,20 @@
 
 package org.geometerplus.zlibrary.core.language;
 
-import java.io.File;
 import java.util.*;
 
 import org.geometerplus.zlibrary.core.filesystem.*;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 public abstract class ZLLanguageList {
-	private static ArrayList<String> ourLanguageCodes = new ArrayList();
+	private static ArrayList<String> ourLanguageCodes = new ArrayList<String>();
 
 	private ZLLanguageList() {
 	}
 	
 	public static List<String> languageCodes() {
 		if (ourLanguageCodes.isEmpty()) {
-			TreeSet codes = new TreeSet();
+			TreeSet<String> codes = new TreeSet<String>();
 			for (ZLFile file : patternsFile().children()) {
 				String name = file.getName(false);
 				final int index = name.indexOf("_");

src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java

@@ -54,7 +54,12 @@ public abstract class ZLLanguageMatcher {
 	};
 
 	static class ZLLanguagePatternBasedMatcher extends ZLWordBasedMatcher {
-		public ZLLanguagePatternBasedMatcher(ZLFile file, ZLLanguageDetector.LanguageInfo info)  {
+
+		private int myProCounter;
+	    private int myContraCounter;
+	    private	ArrayList<String> myDictionary = new ArrayList<String>();
+
+	    public ZLLanguagePatternBasedMatcher(ZLFile file, ZLLanguageDetector.LanguageInfo info)  {
 			super(info);
 			try{
 			InputStream dictionaryStream = file.getInputStream();
@@ -101,9 +106,5 @@ public abstract class ZLLanguageMatcher {
 		public	int criterion() {
 			return myProCounter * 2000 / (myProCounter + myContraCounter) - 1000;
 		}
-
-		private int myProCounter;
-	    private int myContraCounter;
-	    private	ArrayList/*<String>*/ myDictionary = new ArrayList();
 	};
 }

src/org/geometerplus/zlibrary/core/network/ZLX509TrustManager.java

@@ -20,7 +20,6 @@
 package org.geometerplus.zlibrary.core.network;
 
 import java.io.*;
-import java.net.*;
 import javax.net.ssl.*;
 import java.security.GeneralSecurityException;
 import java.security.cert.*;

src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java

@@ -62,23 +62,23 @@ public class ZLColorOptionBuilder {
 		}
 
 		public ZLColor getColor() {
-			Object color = myData.myCurrentColors.get(myData.myCurrentOptionName);
+			ZLColor color = myData.myCurrentColors.get(myData.myCurrentOptionName);
-			return (color != null) ? (ZLColor)color : initialColor();
+			return (color != null) ? color : initialColor();
 		}
 
 		public ZLColor initialColor() {
-			return ((ZLColorOption)myData.myOptions.get(myData.myCurrentOptionName)).getValue();
+			return myData.myOptions.get(myData.myCurrentOptionName).getValue();
 		}
 
 		public void onAccept(ZLColor color) {
 			onReset(color);
-			final ArrayList optionNames = myData.myOptionNames;
+			final ArrayList<String> optionNames = myData.myOptionNames;
-			final HashMap options = myData.myOptions;
+			final HashMap<String,ZLColorOption> options = myData.myOptions;
-			final HashMap colors = myData.myCurrentColors;
+			final HashMap<String,ZLColor> colors = myData.myCurrentColors;
 			final int len = optionNames.size();
 			for (int i = 0; i < len; i++) {
-				Object name = optionNames.get(i);
+				String name = optionNames.get(i);
-				((ZLColorOption)options.get(name)).setValue((ZLColor)colors.get(name));
+				options.get(name).setValue(colors.get(name));
 			}
 		}
 
@@ -94,7 +94,7 @@ public class ZLColorOptionBuilder {
 			myData = data;
 		}
 		
-		public ArrayList getValues() {
+		public ArrayList<String> getValues() {
 			return myData.myOptionNames;
 		}
 
@@ -109,7 +109,7 @@ public class ZLColorOptionBuilder {
 		}
 
 		public void onValueSelected(int index) {
-			myData.myCurrentOptionName = (String)getValues().get(index);
+			myData.myCurrentOptionName = getValues().get(index);
 			myData.myColorEntry.resetView();
 			myData.myPreviousOptionName = myData.myCurrentOptionName;
 		}
@@ -120,8 +120,8 @@ public class ZLColorOptionBuilder {
 		private ZLColorOptionEntry myColorEntry;
 		private String myCurrentOptionName;
 		private String myPreviousOptionName;
-		private final ArrayList/*<String>*/ myOptionNames = new ArrayList();
+		private final ArrayList<String> myOptionNames = new ArrayList<String>();
-		private final HashMap/*<String,ZLColor>*/ myCurrentColors = new HashMap();
+		private final HashMap<String,ZLColor> myCurrentColors = new HashMap<String,ZLColor>();
-		private final HashMap/*<String,ZLColorOption>*/ myOptions = new HashMap();
+		private final HashMap<String,ZLColorOption> myOptions = new HashMap<String,ZLColorOption>();
 	}		
 }

src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java

@@ -38,7 +38,7 @@ public class ZLFontFamilyOptionEntry extends ZLComboOptionEntry {
 		}	
 	}
 
-	public ArrayList getValues() {
+	public ArrayList<String> getValues() {
 		return myContext.fontFamilies();
 	}
 

src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java

@@ -21,13 +21,12 @@ package org.geometerplus.zlibrary.core.optionEntries;
 
 import java.util.*;
 
-import org.geometerplus.zlibrary.core.util.*;
 import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry;
 import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
 
 public class ZLToggleBooleanOptionEntry extends ZLSimpleBooleanOptionEntry {
-	private final ArrayList myDependentEntries = new ArrayList();
+	private final ArrayList<ZLOptionEntry> myDependentEntries = new ArrayList<ZLOptionEntry>();
-	
+
 	public ZLToggleBooleanOptionEntry(ZLBooleanOption option) {
 		super(option);
 	}
@@ -35,14 +34,16 @@ public class ZLToggleBooleanOptionEntry extends ZLSimpleBooleanOptionEntry {
 	public void addDependentEntry(ZLOptionEntry dependent) {
 		myDependentEntries.add(dependent);
 	}
-	
+
+	@Override
 	public void onStateChanged(boolean state) {
 		final int size = myDependentEntries.size();
 		for (int i = 0; i < size; i++) {
-			((ZLOptionEntry)myDependentEntries.get(i)).setVisible(state);
+			myDependentEntries.get(i).setVisible(state);
 		}
 	}
 
+	@Override
 	public void onReset() {
 		onStateChanged(initialState());
 	}

src/org/geometerplus/zlibrary/core/resources/ZLResource.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.zlibrary.core.resources;
 
-import org.geometerplus.zlibrary.core.library.ZLibrary;
-
 abstract public class ZLResource {
 	public final String Name;
 	

src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java

@@ -21,7 +21,6 @@ package org.geometerplus.zlibrary.core.resources;
 
 import java.util.*;
 
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.xml.ZLStringMap;
 import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter;
 import org.geometerplus.zlibrary.core.filesystem.*;
@@ -91,10 +90,12 @@ final class ZLTreeResource extends ZLResource {
 			read(file);
 		}
 
+		@Override
 		public boolean dontCacheAttributeValues() {
 			return true;
 		}
 
+		@Override
 		public boolean startElementHandler(String tag, ZLStringMap attributes) {
 			final ArrayList<ZLTreeResource> stack = myStack;
 			if (!stack.isEmpty() && (NODE.equals(tag))) {
@@ -125,8 +126,9 @@ final class ZLTreeResource extends ZLResource {
 			return false;
 		}
 
+		@Override
 		public boolean endElementHandler(String tag) {
-			final ArrayList stack = myStack;
+			final ArrayList<ZLTreeResource> stack = myStack;
 			if (!stack.isEmpty() && (NODE.equals(tag))) {
 				stack.remove(stack.size() - 1);
 			}

src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java

@@ -20,7 +20,6 @@
 package org.geometerplus.zlibrary.core.sqliteconfig;
 
 import android.content.Context;
-import android.database.Cursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;

src/org/geometerplus/zlibrary/core/tree/ZLTree.java

@@ -21,7 +21,7 @@ package org.geometerplus.zlibrary.core.tree;
 
 import java.util.*;
 
-public abstract class ZLTree<T extends ZLTree> implements Iterable<T> {
+public abstract class ZLTree<T extends ZLTree<T>> implements Iterable<T> {
 	private int mySize = 1;
 	public final T Parent;
 	public final int Level;
@@ -50,7 +50,7 @@ public abstract class ZLTree<T extends ZLTree> implements Iterable<T> {
 		Parent = parent;
 		if (parent != null) {
 			Level = parent.Level + 1;
-			parent.addSubTree(this, position);
+			parent.addSubTree((T)this, position);
 		} else {
 			Level = nullLevel;
 		}
@@ -100,14 +100,14 @@ public abstract class ZLTree<T extends ZLTree> implements Iterable<T> {
 			subtree = mySubTrees.set(position++, subtree);
 		}
 		mySubTrees.add(subtree);
-		for (ZLTree parent = this; parent != null; parent = parent.Parent) {
+		for (ZLTree<?> parent = this; parent != null; parent = parent.Parent) {
 			parent.mySize += subTreeSize;
 		}
 	}
 
 	public void removeSelf() {
 		final int subTreeSize = getSize();
-		ZLTree parent = Parent;
+		ZLTree<?> parent = Parent;
 		if (parent != null) {
 			parent.mySubTrees.remove(this);
 			if (parent.mySubTrees.isEmpty()) {
@@ -124,7 +124,7 @@ public abstract class ZLTree<T extends ZLTree> implements Iterable<T> {
 		mySubTrees = null;
 		mySize = 1;
 		if (subTreesSize > 0) {
-			for (ZLTree parent = Parent; parent != null; parent = parent.Parent) {
+			for (ZLTree<?> parent = Parent; parent != null; parent = parent.Parent) {
 				parent.mySize -= subTreesSize;
 			}
 		}

src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java

@@ -25,7 +25,7 @@ import org.geometerplus.zlibrary.core.util.*;
 import org.geometerplus.zlibrary.core.image.ZLImageData;
 
 abstract public class ZLPaintContext {
-	private final ArrayList myFamilies = new ArrayList();
+	private final ArrayList<String> myFamilies = new ArrayList<String>();
 
 	public interface LineStyle {
 		int SOLID_LINE = 0;
@@ -145,13 +145,13 @@ abstract public class ZLPaintContext {
 	abstract public void drawFilledCircle(int x, int y, int r);
 	abstract public void drawOutline(int[] xs, int ys[]);
 
-	public ArrayList fontFamilies() {
+	public ArrayList<String> fontFamilies() {
 		if (myFamilies.isEmpty()) {
 			fillFamiliesList(myFamilies);
 		}
 		return myFamilies;
 	}	
-	
+
 	abstract public String realFontFamilyName(String fontFamily);
-	abstract protected void fillFamiliesList(ArrayList families);
+	abstract protected void fillFamiliesList(ArrayList<String> families);
 }

src/org/geometerplus/zlibrary/core/view/ZLView.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.zlibrary.core.view;
 
-import org.geometerplus.zlibrary.core.application.ZLApplication;
-
 abstract public class ZLView {
 	public final ZLPaintContext Context;
 

src/org/geometerplus/zlibrary/core/xml/ZLDTDParser.java

@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 import org.geometerplus.zlibrary.core.util.ZLArrayUtils;
 
@@ -41,7 +40,7 @@ final class ZLDTDParser {
 	private static final byte VALUE = 10;
 	private static final byte WAIT_END_OF_ENTITY = 11;
 
-	public void doIt(final InputStream stream, final HashMap entityMap) throws IOException {
+	public void doIt(final InputStream stream, final HashMap<String,char[]> entityMap) throws IOException {
 		final InputStreamReader streamReader = new InputStreamReader(stream, "us-ascii");
 
 		char[] buffer = new char[8192];

src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java

@@ -22,9 +22,7 @@ package org.geometerplus.zlibrary.core.xml;
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import org.geometerplus.zlibrary.core.util.*;
 import org.geometerplus.zlibrary.core.filesystem.*;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 
 import org.geometerplus.zlibrary.core.util.ZLArrayUtils;
 import org.geometerplus.zlibrary.core.xml.ZLStringMap;
@@ -35,8 +33,8 @@ final class ZLXMLParser {
 	private static final byte START_TAG = 1;
 	private static final byte END_TAG = 2;
 	private static final byte TEXT = 3;
-	private static final byte IGNORABLE_WHITESPACE = 4;
+	//private static final byte IGNORABLE_WHITESPACE = 4;
-	private static final byte PROCESSING_INSTRUCTION = 5;
+	//private static final byte PROCESSING_INSTRUCTION = 5;
 	private static final byte COMMENT = 6; // tag of form <!-- -->
 	private static final byte END_OF_COMMENT1 = 7;
 	private static final byte END_OF_COMMENT2 = 8;
@@ -172,7 +170,8 @@ final class ZLXMLParser {
 		return value;
 	}
 
-	private static ConcurrentHashMap<List<String>,HashMap<String,char[]>> ourDTDMaps = new ConcurrentHashMap(); // FIXME: concurrency violation
+	private static ConcurrentHashMap<List<String>,HashMap<String,char[]>> ourDTDMaps = 
+		new ConcurrentHashMap<List<String>,HashMap<String,char[]>>(); // FIXME: concurrency violation
 
 	static HashMap<String,char[]> getDTDMap(List<String> dtdList) throws IOException {
 		HashMap<String,char[]> entityMap = ourDTDMaps.get(dtdList);
@@ -194,7 +193,8 @@ final class ZLXMLParser {
 		return entityMap;
 	}
 
-	private final static ConcurrentHashMap ourStringMap = new ConcurrentHashMap();
+	private final static ConcurrentHashMap<ZLMutableString,String> ourStringMap = 
+		new ConcurrentHashMap<ZLMutableString,String>();
 
 	void doIt() throws IOException {
 		final ZLXMLReader xmlReader = myXMLReader;
@@ -737,7 +737,7 @@ mainSwitchLabel:
 		return false;
 	}
 
-	private static boolean processStartTag(ZLXMLReader xmlReader, String tagName, ZLStringMap attributes, HashMap currentNamespaceMap) {
+	private static boolean processStartTag(ZLXMLReader xmlReader, String tagName, ZLStringMap attributes, HashMap<String,String> currentNamespaceMap) {
 		if (xmlReader.startElementHandler(tagName, attributes)) {
 			return true;
 		}
@@ -748,7 +748,7 @@ mainSwitchLabel:
 		return false;
 	}
 
-	private static boolean processEndTag(ZLXMLReader xmlReader, String tagName, HashMap currentNamespaceMap) {
+	private static boolean processEndTag(ZLXMLReader xmlReader, String tagName, HashMap<String,String> currentNamespaceMap) {
 		if (currentNamespaceMap != null) {
 			xmlReader.namespaceMapChangedHandler(currentNamespaceMap);
 		}

src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java

@@ -23,7 +23,6 @@ import java.util.*;
 import java.io.*;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 
 public abstract class ZLXMLProcessor {
 	public static Map<String,char[]> getEntityMap(List<String> dtdList) {

src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java

@@ -19,7 +19,6 @@
 
 package org.geometerplus.zlibrary.text.hyphenation;
 
-import java.util.*;
 import org.geometerplus.zlibrary.core.util.*;
 
 import org.geometerplus.zlibrary.text.view.ZLTextWord; 

src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.zlibrary.text.hyphenation;
 
-import java.util.Arrays;
-
 public final class ZLTextTeXHyphenationPattern {
 	int myLength;
 	final char[] mySymbols;

src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java

@@ -21,13 +21,13 @@ package org.geometerplus.zlibrary.text.hyphenation;
 
 import java.util.*;
 import org.geometerplus.zlibrary.core.util.ZLMiscUtil;
-import org.geometerplus.zlibrary.core.library.ZLibrary;
 import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
 
 public final class ZLTextTeXHyphenator extends ZLTextHyphenator {
-	private final HashMap myPatternTable = new HashMap();
+	private final HashMap<ZLTextTeXHyphenationPattern,ZLTextTeXHyphenationPattern> myPatternTable = 
+		new HashMap<ZLTextTeXHyphenationPattern,ZLTextTeXHyphenationPattern>();
 	private String myLanguage;
-	
+
 	public ZLTextTeXHyphenator() {
 	}
 
@@ -62,8 +62,8 @@ public final class ZLTextTeXHyphenator extends ZLTextHyphenator {
 		}
 
 		byte[] values = new byte[length + 1];
-		
+
-		final HashMap table = myPatternTable;
+		final HashMap<ZLTextTeXHyphenationPattern,ZLTextTeXHyphenationPattern> table = myPatternTable;
 		ZLTextTeXHyphenationPattern pattern =
 			new ZLTextTeXHyphenationPattern(stringToHyphenate, 0, length, false);
 		for (int offset = 0; offset < length - 1; offset++) {

src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java

@@ -22,9 +22,10 @@ package org.geometerplus.zlibrary.text.model;
 import java.lang.ref.WeakReference;
 import java.io.*;
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 final class CachedCharStorageException extends RuntimeException {
+	private static final long serialVersionUID = -6373408730045821053L;
+
 	public CachedCharStorageException(String message) {
 		super(message);
 	}
@@ -86,7 +87,7 @@ public final class CachedCharStorage implements CharStorage {
 			blockSize = minimumLength;
 		}
 		char[] block = new char[blockSize];
-		myArray.add(new WeakReference(block));
+		myArray.add(new WeakReference<char[]>(block));
 		return block;
 	}
 

src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java

@@ -20,7 +20,6 @@
 package org.geometerplus.zlibrary.text.model;
 
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 final class SimpleCharStorage implements CharStorage {
 	private final int myBlockSize;

src/org/geometerplus/zlibrary/text/model/ZLTextWritableModel.java

@@ -19,8 +19,6 @@
 
 package org.geometerplus.zlibrary.text.model;
 
-import org.geometerplus.zlibrary.core.image.ZLImageMap;
-
 public interface ZLTextWritableModel extends ZLTextModel {
 	void createParagraph(byte kind);
 

src/org/geometerplus/zlibrary/text/model/ZLTextWritablePlainModel.java

@@ -19,7 +19,6 @@
 
 package org.geometerplus.zlibrary.text.model;
 
-import java.util.*;
 import org.geometerplus.zlibrary.core.util.*;
 
 import org.geometerplus.zlibrary.core.image.ZLImageMap;

src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java

@@ -32,17 +32,15 @@ public class ZLTextAlignmentOptionEntry extends ZLComboOptionEntry {
 	private static final String KEY_JUSTIFY = "justify";
 	private static final String KEY_UNCHANGED = "unchanged";
 	
-	private static final ArrayList ourValues4 = new ArrayList();
+	private static final ArrayList<String> ourValues4 = new ArrayList<String>();
-	private static final ArrayList ourValues5 = new ArrayList();
+	private static final ArrayList<String> ourValues5 = new ArrayList<String>();
 
-	private	final ZLResource myResource;
 	private	final ZLIntegerOption myOption;
 	private	final boolean myAllowUndefined;
 		
 	public ZLTextAlignmentOptionEntry(ZLIntegerOption option, final ZLResource resource, boolean allowUndefined) {
 		myAllowUndefined = allowUndefined;
 		myOption = option;
-		myResource = resource;
 		if (ourValues5.isEmpty()) {
 			ourValues5.add(resource.getResource(KEY_UNCHANGED).getValue());
 			String value = resource.getResource(KEY_LEFT).getValue();
@@ -60,7 +58,7 @@ public class ZLTextAlignmentOptionEntry extends ZLComboOptionEntry {
 		}
 	}	
 		
-	public ArrayList getValues() {
+	public ArrayList<String> getValues() {
 		return myAllowUndefined ? ourValues5 : ourValues4;
 	}
 

src/org/geometerplus/zlibrary/text/view/ZLTextElementAreaVector.java

@@ -22,6 +22,8 @@ package org.geometerplus.zlibrary.text.view;
 import java.util.ArrayList;
 
 final class ZLTextElementAreaVector extends ArrayList<ZLTextElementArea> {
+	private static final long serialVersionUID = -5045824474350948281L;
+
 	final ArrayList<ZLTextHyperlinkArea> HyperlinkAreas = new ArrayList<ZLTextHyperlinkArea>();
 	private ZLTextHyperlinkArea myCurrentHyperlinkArea;
 

src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java

@@ -27,7 +27,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.view.ZLPaintContext;
 
 public class ZLTextFontFamilyWithBaseOptionEntry extends ZLFontFamilyOptionEntry {
-	private static final ArrayList ourAllFamilies = new ArrayList();
+	private static final ArrayList<String> ourAllFamilies = new ArrayList<String>();
 
 	private final ZLResource myResource;
 		
@@ -36,20 +36,23 @@ public class ZLTextFontFamilyWithBaseOptionEntry extends ZLFontFamilyOptionEntry
 		myResource = resource;
 	}
 
-	public ArrayList getValues() {
+	@Override
+	public ArrayList<String> getValues() {
 		if (ourAllFamilies.size() == 0) {
-			final ArrayList families = super.getValues();
+			final ArrayList<String> families = super.getValues();
 			ourAllFamilies.add(myResource.getResource("unchanged").getValue());
 			ourAllFamilies.addAll(families);
 		}
 		return ourAllFamilies;
 	}
 
+	@Override
 	public String initialValue() {
 		final String value = super.initialValue();
-		return ((value == null) || (value.length() == 0)) ? (String)(getValues().get(0)) : value;
+		return ((value == null) || (value.length() == 0)) ? getValues().get(0) : value;
 	}
 
+	@Override
 	public void onAccept(String value) {
 		super.onAccept((value.equals(getValues().get(0))) ? "" : value);
 	}

src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java

@@ -20,7 +20,6 @@
 package org.geometerplus.zlibrary.text.view;
 
 import java.util.ArrayList;
-import org.geometerplus.zlibrary.core.util.*;
 
 import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry;
 import org.geometerplus.zlibrary.core.options.ZLIntegerOption;
@@ -29,8 +28,8 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 public class ZLTextLineSpaceOptionEntry extends ZLComboOptionEntry {
 	private static final String KEY_UNCHANGED = "unchanged";
-	private static final ArrayList ourAllValues = new ArrayList();
+	private static final ArrayList<String> ourAllValues = new ArrayList<String>();
-	private static final ArrayList ourAllValuesPlusBase = new ArrayList();
+	private static final ArrayList<String> ourAllValuesPlusBase = new ArrayList<String>();
 
 	private final ZLIntegerOption myOption;
 	private final ZLResource myResource;
@@ -48,18 +47,18 @@ public class ZLTextLineSpaceOptionEntry extends ZLComboOptionEntry {
 			ourAllValuesPlusBase.addAll(ourAllValues);
 		}
 	}
-		
+
-	public ArrayList getValues() {
+	public ArrayList<String> getValues() {
 		return myAllowBase ? ourAllValuesPlusBase : ourAllValues;
 	}
 
 	public String initialValue() {
 		final int value = myOption.getValue();
 		if (value == -1) {
-			return (String) ourAllValuesPlusBase.get(0);
+			return ourAllValuesPlusBase.get(0);
 		}
 		final int index = Math.max(0, Math.min(15, (value + 5) / 10 - 5));
-		return (String) ourAllValues.get(index);
+		return ourAllValues.get(index);
 	}
 
 	public void onAccept(String value) {

src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java

@@ -96,7 +96,7 @@ public final class ZLTextParagraphCursor {
 		private static byte[] ourBreaks = new byte[1024];
 		private static final int NO_SPACE = 0;
 		private static final int SPACE = 1;
-		private static final int NON_BREAKABLE_SPACE = 2;
+		//private static final int NON_BREAKABLE_SPACE = 2;
 		private void processTextEntry(final char[] data, final int offset, final int length) {
 			if (length != 0) {
 				if (ourBreaks.length < length) {

src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursorCache.java

@@ -21,7 +21,6 @@ package org.geometerplus.zlibrary.text.view;
 
 import java.lang.ref.WeakReference;
 import java.util.*;
-import org.geometerplus.zlibrary.core.util.*;
 
 import org.geometerplus.zlibrary.text.model.ZLTextModel;
 

src/org/geometerplus/zlibrary/text/view/ZLTextSelectionModel.java

@@ -100,7 +100,7 @@ final class ZLTextSelectionModel {
 	private boolean myIsActive;
 	private boolean myIsEmpty = true;
 	private boolean myDoUpdate;
-	private boolean myTextIsUpToDate = true;
+	//private boolean myTextIsUpToDate = true;
 
 	private int myStoredX;
 	private int myStoredY;
@@ -108,7 +108,6 @@ final class ZLTextSelectionModel {
 	private final Bound myFirstBound = new Bound();
 	private final Bound mySecondBound = new Bound();
 
-	private final HashSet myCursors = new HashSet();
 	private final StringBuilder myText = new StringBuilder();
 
 	ZLTextSelectionModel(ZLTextView view) {
@@ -124,9 +123,8 @@ final class ZLTextSelectionModel {
 		myIsEmpty = false;
 		setBound(myFirstBound, x, y);
 		mySecondBound.copyFrom(myFirstBound);
-		myCursors.clear();
 		myText.delete(0, myText.length());
-		myTextIsUpToDate = true;
+		//myTextIsUpToDate = true;
 	}
 
 	boolean extendTo(int x, int y) {
@@ -149,7 +147,7 @@ final class ZLTextSelectionModel {
 		}
 
 		if (!oldRange.Left.equalsTo(newRange.Left) || !oldRange.Right.equalsTo(newRange.Right)) {
-			myTextIsUpToDate = false;
+			//myTextIsUpToDate = false;
 			myText.delete(0, myText.length());
 			return true;
 		}
@@ -163,7 +161,7 @@ final class ZLTextSelectionModel {
 			myDoUpdate = false;
 			setBound(mySecondBound, myStoredX, myStoredY);
 			//myView.copySelectedTextToClipboard(ZLDialogManager::CLIPBOARD_SELECTION);
-			myTextIsUpToDate = false;
+			//myTextIsUpToDate = false;
 			myText.delete(0, myText.length());
 		}
 	}
@@ -179,9 +177,8 @@ final class ZLTextSelectionModel {
 		myIsEmpty = true;
 		myIsActive = false;
 		myDoUpdate = false;
-		myCursors.clear();
 		myText.delete(0, myText.length());
-		myTextIsUpToDate = true;
+		//myTextIsUpToDate = true;
 	}
 
 	Range getRange() {