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

encoding-related classes were moved to org.geometerplus.zlibrary.core.encodings package

Browse source
This commit is contained in:
Nikolay Pultsin 2012-03-23 17:47:32 +00:00
parent 53a1e81da0
commit 98fd03511b
14 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
jni/NativeFormats/util/AndroidUtil.cpp
View file

@ -31,9 +31,9 @@ const char * const AndroidUtil::Class_java_io_PrintStream = "java/io/PrintStream
const char * const AndroidUtil::Class_ZLibrary = "org/geometerplus/zlibrary/core/library/ZLibrary"; const char * const AndroidUtil::Class_ZLibrary = "org/geometerplus/zlibrary/core/library/ZLibrary";
const char * const AndroidUtil::Class_NativeFormatPlugin = "org/geometerplus/fbreader/formats/NativeFormatPlugin"; const char * const AndroidUtil::Class_NativeFormatPlugin = "org/geometerplus/fbreader/formats/NativeFormatPlugin";
const char * const AndroidUtil::Class_PluginCollection = "org/geometerplus/fbreader/formats/PluginCollection"; const char * const AndroidUtil::Class_PluginCollection = "org/geometerplus/fbreader/formats/PluginCollection";
const char * const AndroidUtil::Class_Encoding = "org/geometerplus/fbreader/formats/Encoding"; const char * const AndroidUtil::Class_Encoding = "org/geometerplus/zlibrary/core/encodings/Encoding";
const char * const AndroidUtil::Class_EncodingConverter = "org/geometerplus/fbreader/formats/EncodingConverter"; const char * const AndroidUtil::Class_EncodingConverter = "org/geometerplus/zlibrary/core/encodings/EncodingConverter";
const char * const AndroidUtil::Class_JavaEncodingCollection = "org/geometerplus/fbreader/formats/JavaEncodingCollection"; const char * const AndroidUtil::Class_JavaEncodingCollection = "org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection";
const char * const AndroidUtil::Class_Paths = "org/geometerplus/fbreader/Paths"; const char * const AndroidUtil::Class_Paths = "org/geometerplus/fbreader/Paths";
const char * const AndroidUtil::Class_ZLFile = "org/geometerplus/zlibrary/core/filesystem/ZLFile"; const char * const AndroidUtil::Class_ZLFile = "org/geometerplus/zlibrary/core/filesystem/ZLFile";
const char * const AndroidUtil::Class_Book = "org/geometerplus/fbreader/library/Book"; const char * const AndroidUtil::Class_Book = "org/geometerplus/fbreader/library/Book";
@ -163,7 +163,7 @@ bool AndroidUtil::init(JavaVM* jvm) {
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);
CHECK_NULL( cls = env->FindClass(Class_Encoding) ); CHECK_NULL( cls = env->FindClass(Class_Encoding) );
CHECK_NULL( MID_Encoding_createConverter = env->GetMethodID(cls, "createConverter", "()Lorg/geometerplus/fbreader/formats/EncodingConverter;") ); CHECK_NULL( MID_Encoding_createConverter = env->GetMethodID(cls, "createConverter", "()Lorg/geometerplus/zlibrary/core/encodings/EncodingConverter;") );
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);
CHECK_NULL( cls = env->FindClass(Class_EncodingConverter) ); CHECK_NULL( cls = env->FindClass(Class_EncodingConverter) );
@ -173,9 +173,9 @@ bool AndroidUtil::init(JavaVM* jvm) {
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);
CHECK_NULL( cls = env->FindClass(Class_JavaEncodingCollection) ); CHECK_NULL( cls = env->FindClass(Class_JavaEncodingCollection) );
CHECK_NULL( SMID_JavaEncodingCollection_Instance = env->GetStaticMethodID(cls, "Instance", "()Lorg/geometerplus/fbreader/formats/JavaEncodingCollection;") ); CHECK_NULL( SMID_JavaEncodingCollection_Instance = env->GetStaticMethodID(cls, "Instance", "()Lorg/geometerplus/zlibrary/core/encodings/JavaEncodingCollection;") );
CHECK_NULL( MID_JavaEncodingCollection_getEncoding_String = env->GetMethodID(cls, "getEncoding", "(Ljava/lang/String;)Lorg/geometerplus/fbreader/formats/Encoding;") ); CHECK_NULL( MID_JavaEncodingCollection_getEncoding_String = env->GetMethodID(cls, "getEncoding", "(Ljava/lang/String;)Lorg/geometerplus/zlibrary/core/encodings/Encoding;") );
CHECK_NULL( MID_JavaEncodingCollection_getEncoding_int = env->GetMethodID(cls, "getEncoding", "(I)Lorg/geometerplus/fbreader/formats/Encoding;") ); CHECK_NULL( MID_JavaEncodingCollection_getEncoding_int = env->GetMethodID(cls, "getEncoding", "(I)Lorg/geometerplus/zlibrary/core/encodings/Encoding;") );
CHECK_NULL( MID_JavaEncodingCollection_providesConverterFor = env->GetMethodID(cls, "providesConverterFor", "(Ljava/lang/String;)Z") ); CHECK_NULL( MID_JavaEncodingCollection_providesConverterFor = env->GetMethodID(cls, "providesConverterFor", "(Ljava/lang/String;)Z") );
env->DeleteLocalRef(cls); env->DeleteLocalRef(cls);

12
proguard.cfg
View file

@ -35,18 +35,18 @@
-keepclassmembers class org.geometerplus.fbreader.formats.FormatPlugin { -keepclassmembers class org.geometerplus.fbreader.formats.FormatPlugin {
public ** supportedFileType(); public ** supportedFileType();
} }
-keep class org.geometerplus.fbreader.formats.Encoding -keep class org.geometerplus.zlibrary.core.encodings.Encoding
-keepclassmembers class org.geometerplus.fbreader.formats.Encoding { -keepclassmembers class org.geometerplus.zlibrary.core.encodings.Encoding {
public ** createConverter(); public ** createConverter();
} }
-keep class org.geometerplus.fbreader.formats.EncodingConverter -keep class org.geometerplus.zlibrary.core.encodings.EncodingConverter
-keepclassmembers class org.geometerplus.fbreader.formats.EncodingConverter { -keepclassmembers class org.geometerplus.zlibrary.core.encodings.EncodingConverter {
public ** Name; public ** Name;
public int convert(byte[],int,int,byte[],int); public int convert(byte[],int,int,byte[],int);
public void reset(); public void reset();
} }
-keep class org.geometerplus.fbreader.formats.JavaEncodingCollection -keep class org.geometerplus.zlibrary.core.encodings.JavaEncodingCollection
-keepclassmembers class org.geometerplus.fbreader.formats.JavaEncodingCollection { -keepclassmembers class org.geometerplus.zlibrary.core.encodings.JavaEncodingCollection {
public static ** Instance(); public static ** Instance();
public ** getEncoding(java.lang.String); public ** getEncoding(java.lang.String);
public ** getEncoding(int); public ** getEncoding(int);

5
src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
View file

@ -24,9 +24,10 @@ import java.util.*;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.language.ZLLanguageUtil;
import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.encodings.Encoding;
import org.geometerplus.zlibrary.core.language.ZLLanguageUtil;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;

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

@ -20,6 +20,7 @@
package org.geometerplus.fbreader.formats; package org.geometerplus.fbreader.formats;
import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.encodings.EncodingCollection;
import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookModel;

3
src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
View file

@ -20,6 +20,7 @@
package org.geometerplus.fbreader.formats; package org.geometerplus.fbreader.formats;
import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.encodings.JavaEncodingCollection;
import org.geometerplus.zlibrary.core.image.*; import org.geometerplus.zlibrary.core.image.*;
import org.geometerplus.zlibrary.core.util.MimeType; import org.geometerplus.zlibrary.core.util.MimeType;
@ -103,7 +104,7 @@ public class NativeFormatPlugin extends FormatPlugin {
} }
@Override @Override
public EncodingCollection supportedEncodings() { public JavaEncodingCollection supportedEncodings() {
// TODO: implement // TODO: implement
return JavaEncodingCollection.Instance(); return JavaEncodingCollection.Instance();
} }

3
src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java
View file

@ -20,6 +20,7 @@
package org.geometerplus.fbreader.formats.fb2; package org.geometerplus.fbreader.formats.fb2;
import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.encodings.AutoEncodingCollection;
import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookModel;
@ -53,7 +54,7 @@ public class FB2Plugin extends JavaFormatPlugin {
} }
@Override @Override
public EncodingCollection supportedEncodings() { public AutoEncodingCollection supportedEncodings() {
return new AutoEncodingCollection(); return new AutoEncodingCollection();
} }

3
src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java
View file

@ -20,6 +20,7 @@
package org.geometerplus.fbreader.formats.oeb; package org.geometerplus.fbreader.formats.oeb;
import org.geometerplus.zlibrary.core.filesystem.*; import org.geometerplus.zlibrary.core.filesystem.*;
import org.geometerplus.zlibrary.core.encodings.AutoEncodingCollection;
import org.geometerplus.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookModel;
@ -85,7 +86,7 @@ public class OEBPlugin extends JavaFormatPlugin {
} }
@Override @Override
public EncodingCollection supportedEncodings() { public AutoEncodingCollection supportedEncodings() {
return new AutoEncodingCollection(); return new AutoEncodingCollection();
} }

6
src/org/geometerplus/fbreader/formats/pdb/MobipocketPlugin.java
View file

@ -23,13 +23,15 @@ import java.io.*;
import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.image.*; import org.geometerplus.zlibrary.core.image.*;
import org.geometerplus.zlibrary.core.encodings.Encoding;
import org.geometerplus.zlibrary.core.encodings.JavaEncodingCollection;
import org.geometerplus.zlibrary.core.language.ZLLanguageUtil; import org.geometerplus.zlibrary.core.language.ZLLanguageUtil;
import org.geometerplus.zlibrary.core.util.MimeType; import org.geometerplus.zlibrary.core.util.MimeType;
import org.geometerplus.fbreader.library.Book; import org.geometerplus.fbreader.library.Book;
import org.geometerplus.fbreader.bookmodel.BookModel; import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.bookmodel.BookReadingException; import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.*; import org.geometerplus.fbreader.formats.JavaFormatPlugin;
public class MobipocketPlugin extends JavaFormatPlugin { public class MobipocketPlugin extends JavaFormatPlugin {
public MobipocketPlugin() { public MobipocketPlugin() {
@ -245,7 +247,7 @@ public class MobipocketPlugin extends JavaFormatPlugin {
} }
@Override @Override
public EncodingCollection supportedEncodings() { public JavaEncodingCollection supportedEncodings() {
return JavaEncodingCollection.Instance(); return JavaEncodingCollection.Instance();
} }

2
src/org/geometerplus/fbreader/formats/AutoEncodingCollection.java → src/org/geometerplus/zlibrary/core/encodings/AutoEncodingCollection.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.formats; package org.geometerplus.zlibrary.core.encodings;
import java.util.List; import java.util.List;
import java.util.Collections; import java.util.Collections;

2
src/org/geometerplus/fbreader/formats/Encoding.java → src/org/geometerplus/zlibrary/core/encodings/Encoding.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.formats; package org.geometerplus.zlibrary.core.encodings;
public final class Encoding { public final class Encoding {
public final String Family; public final String Family;

2
src/org/geometerplus/fbreader/formats/EncodingCollection.java → src/org/geometerplus/zlibrary/core/encodings/EncodingCollection.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.formats; package org.geometerplus.zlibrary.core.encodings;
import java.util.List; import java.util.List;

2
src/org/geometerplus/fbreader/formats/EncodingConverter.java → src/org/geometerplus/zlibrary/core/encodings/EncodingConverter.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.formats; package org.geometerplus.zlibrary.core.encodings;
import java.nio.*; import java.nio.*;
import java.nio.charset.*; import java.nio.charset.*;

2
src/org/geometerplus/fbreader/formats/FilteredEncodingCollection.java → src/org/geometerplus/zlibrary/core/encodings/FilteredEncodingCollection.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.formats; package org.geometerplus.zlibrary.core.encodings;
import java.util.*; import java.util.*;

2
src/org/geometerplus/fbreader/formats/JavaEncodingCollection.java → src/org/geometerplus/zlibrary/core/encodings/JavaEncodingCollection.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.fbreader.formats; package org.geometerplus.zlibrary.core.encodings;
import java.nio.charset.Charset; import java.nio.charset.Charset;