From c784ad4d8efb86ef6ff0ba5e0090aedcb764bc8a Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Wed, 29 Feb 2012 12:37:29 +0000
Subject: [PATCH] code simplification: no options in PluginCollection.java

Conflicts:

	jni/NativeFormats/fbreader/src/formats/PluginCollection.cpp
	jni/NativeFormats/util/AndroidUtil.cpp
	jni/NativeFormats/util/AndroidUtil.h
---
 src/org/geometerplus/fbreader/formats/PluginCollection.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/org/geometerplus/fbreader/formats/PluginCollection.java b/src/org/geometerplus/fbreader/formats/PluginCollection.java
index 109cf7b4c..4413ff0fd 100644
--- a/src/org/geometerplus/fbreader/formats/PluginCollection.java
+++ b/src/org/geometerplus/fbreader/formats/PluginCollection.java
@@ -38,9 +38,6 @@ public class PluginCollection {
 
 	private final Map<FormatPlugin.Type,List<FormatPlugin>> myPlugins =
 		new HashMap<FormatPlugin.Type,List<FormatPlugin>>();
-	public ZLStringOption DefaultLanguageOption;
-	public ZLStringOption DefaultEncodingOption;
-	public ZLBooleanOption LanguageAutoDetectOption;
 
 	public static PluginCollection Instance() {
 		if (ourInstance == null) {
@@ -61,7 +58,6 @@ public class PluginCollection {
 	}
 
 	private PluginCollection() {
-		LanguageAutoDetectOption = new ZLBooleanOption("Format", "AutoDetect", true);
 		DefaultLanguageOption = new ZLStringOption("Format", "DefaultLanguage", "en");
 		DefaultEncodingOption = new ZLStringOption("Format", "DefaultEncoding", "windows-1252");