yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00
Code Issues Releases Wiki Activity

code simplification: openInBrowser is now a static method in Util; sms account refilling (in progress)

Browse source
This commit is contained in:
Nikolay Pultsin 2010-12-23 20:00:17 +00:00
parent 3309fe02ab
commit 15b1e282a6
6 changed files with 51 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/org/geometerplus/fbreader/formats/FormatPlugin.java
View file

@ -36,7 +36,7 @@ public abstract class FormatPlugin {
String language = book.getLanguage();
String encoding = book.getEncoding();
if (encoding.length() == 0 || language.length() == 0) {
PluginCollection collection = PluginCollection.instance();
PluginCollection collection = PluginCollection.Instance();
if (language.length() == 0) {
language = collection.DefaultLanguageOption.getValue();
}
@ -67,7 +67,7 @@ public abstract class FormatPlugin {
public static void detectEncodingAndLanguage(Book book, InputStream stream) {
String encoding = book.getEncoding();
if (encoding.length() == 0) {
encoding = EncodingDetector.detect(stream, PluginCollection.instance().DefaultLanguageOption.getValue());
encoding = EncodingDetector.detect(stream, PluginCollection.Instance().DefaultLanguageOption.getValue());
if (encoding == "unknown") {
encoding = "windows-1252";
}
@ -84,7 +84,7 @@ public abstract class FormatPlugin {
(encoding.equals("IBM866"))) {
book.setLanguage("ru");
} /*else if (
(PluginCollection.instance().DefaultLanguageOption.getValue() == EncodingDetector.Language.CZECH) &&
(PluginCollection.Instance().DefaultLanguageOption.getValue() == EncodingDetector.Language.CZECH) &&
((encoding == "windows-1250") ||
(encoding == "ISO-8859-2") ||
(encoding == "IBM852"))) {