yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

repackaging: org -> org.geometerplus

Browse source 
git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@811 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Nikolay Pultsin 2008-04-11 00:37:01 +00:00
parent 416ffc8397
commit 739c66d610
363 changed files with 1173 additions and 1186 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build.xml
View file

@ -16,13 +16,13 @@
<target name="depend" depends="prepare"> <target name="depend" depends="prepare">
<depend srcdir="${src.path}" destdir="${bin.dir}" cache="${cache.dir}" closure="yes"> <depend srcdir="${src.path}" destdir="${bin.dir}" cache="${cache.dir}" closure="yes">
<exclude name="org/zlibrary/core/xml/sax/**"/> <exclude name="org/geometerplus/zlibrary/core/xml/sax/**"/>
</depend> </depend>
</target> </target>
<target name="compile" depends="depend"> <target name="compile" depends="depend">
<javac srcdir="${src.path}" destdir="${bin.dir}"> <javac srcdir="${src.path}" destdir="${bin.dir}">
<exclude name="org/zlibrary/core/xml/sax/**"/> <exclude name="org/geometerplus/zlibrary/core/xml/sax/**"/>
</javac> </javac>
</target> </target>
@ -69,7 +69,7 @@
<delete file="FBReaderJ.jad"/> <delete file="FBReaderJ.jad"/>
<delete dir="platform/android/res/raw"/> <delete dir="platform/android/res/raw"/>
<delete dir="platform/android/res/drawable"/> <delete dir="platform/android/res/drawable"/>
<delete file="platform/android/src/org/zlibrary/ui/android/library/R.java"/> <delete file="platform/android/src/org/geometerplus/zlibrary/ui/android/library/R.java"/>
</target> </target>
<target name="sources-archive" depends="clean"> <target name="sources-archive" depends="clean">

2
data/application.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<application> <application>
<property name="applicationClass" value="org.fbreader.fbreader.FBReader"/> <property name="applicationClass" value="org.geometerplus.fbreader.fbreader.FBReader"/>
<property name="applicationName" value="FBReader"/> <property name="applicationName" value="FBReader"/>
</application> </application>

2
manifest.mf
View file

@ -1,2 +1,2 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Main-Class: org.zlibrary.ui.swing.library.Main Main-Class: org.geometerplus.zlibrary.ui.swing.library.Main

2
platform/android/AndroidManifest.xml
View file

@ -1,4 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.zlibrary.ui.android.library"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android.library">
<application android:icon="@drawable/fbreader"> <application android:icon="@drawable/fbreader">
<activity android:name="ZLAndroidActivity" android:label="FBReaderJ"> <activity android:name="ZLAndroidActivity" android:label="FBReaderJ">
<intent-filter> <intent-filter>

4
platform/android/build.xml
View file

@ -71,14 +71,14 @@
<target name="depend" depends="dirs, resource-src"> <target name="depend" depends="dirs, resource-src">
<depend srcdir="${src.path}" destdir="${outdir-classes}" cache="${cachedir}" closure="yes"> <depend srcdir="${src.path}" destdir="${outdir-classes}" cache="${cachedir}" closure="yes">
<exclude name="org/zlibrary/core/xml/sax/**"/> <exclude name="org/geometerplus/zlibrary/core/xml/sax/**"/>
</depend> </depend>
</target> </target>
<!-- Compile this project's .java files into .class files. --> <!-- Compile this project's .java files into .class files. -->
<target name="compile" depends="depend"> <target name="compile" depends="depend">
<javac target="1.5" srcdir="${src.path}" destdir="${outdir-classes}" bootclasspath="${android-jar}"> <javac target="1.5" srcdir="${src.path}" destdir="${outdir-classes}" bootclasspath="${android-jar}">
<exclude name = "org/zlibrary/core/xml/sax/**"/> <exclude name = "org/geometerplus/zlibrary/core/xml/sax/**"/>
</javac> </javac>
</target> </target>

2
platform/android/res/layout/main.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<org.zlibrary.ui.android.view.ZLAndroidWidget <org.geometerplus.zlibrary.ui.android.view.ZLAndroidWidget
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/zlandroidactivity" android:id="@+id/zlandroidactivity"
android:layout_width="fill_parent" android:layout_width="fill_parent"

4
platform/android/src/org/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java → platform/android/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java
View file

@ -1,9 +1,9 @@
package org.zlibrary.core.sqliteconfig; package org.geometerplus.zlibrary.core.sqliteconfig;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import org.zlibrary.core.config.ZLConfig; import org.geometerplus.zlibrary.core.config.ZLConfig;
class ZLSQLiteConfig implements ZLConfig { class ZLSQLiteConfig implements ZLConfig {
private final SQLiteDatabase myDatabase; private final SQLiteDatabase myDatabase;

6
platform/android/src/org/zlibrary/core/sqliteconfig/ZLSQLiteConfigManager.java → platform/android/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfigManager.java
View file

@ -1,11 +1,11 @@
package org.zlibrary.core.sqliteconfig; package org.geometerplus.zlibrary.core.sqliteconfig;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import android.app.Activity; import android.app.Activity;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import org.zlibrary.core.config.ZLConfig; import org.geometerplus.zlibrary.core.config.ZLConfig;
import org.zlibrary.core.config.ZLConfigManager; import org.geometerplus.zlibrary.core.config.ZLConfigManager;
public class ZLSQLiteConfigManager extends ZLConfigManager { public class ZLSQLiteConfigManager extends ZLConfigManager {
private SQLiteDatabase myDatabase; private SQLiteDatabase myDatabase;

10
platform/android/src/org/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java → platform/android/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
View file

@ -1,14 +1,14 @@
package org.zlibrary.ui.android.application; package org.geometerplus.zlibrary.ui.android.application;
import java.util.*; import java.util.*;
import android.view.Menu; import android.view.Menu;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.zlibrary.core.application.ZLApplicationWindow; import org.geometerplus.zlibrary.core.application.ZLApplicationWindow;
import org.zlibrary.ui.android.view.ZLAndroidViewWidget; import org.geometerplus.zlibrary.ui.android.view.ZLAndroidViewWidget;
import org.zlibrary.ui.android.library.ZLAndroidLibrary; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;
public final class ZLAndroidApplicationWindow extends ZLApplicationWindow { public final class ZLAndroidApplicationWindow extends ZLApplicationWindow {
private final HashMap<Menu.Item,ZLApplication.Menubar.PlainItem> myMenuItemMap = private final HashMap<Menu.Item,ZLApplication.Menubar.PlainItem> myMenuItemMap =

4
platform/android/src/org/zlibrary/ui/android/dialogs/AndroidDialog.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/AndroidDialog.java
View file

@ -1,11 +1,11 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.os.Handler; import android.os.Handler;
import android.content.Context; import android.content.Context;
import android.view.*; import android.view.*;
import org.zlibrary.ui.android.library.ZLAndroidLibrary; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;
final class AndroidDialog extends Dialog { final class AndroidDialog extends Dialog {
private final View myView; private final View myView;

6
platform/android/src/org/zlibrary/ui/android/dialogs/ItemView.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ItemView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import java.util.HashMap; import java.util.HashMap;
@ -6,9 +6,9 @@ import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.dialogs.ZLTreeNode; import org.geometerplus.zlibrary.core.dialogs.ZLTreeNode;
import org.zlibrary.ui.android.library.R; import org.geometerplus.zlibrary.ui.android.library.R;
class ItemView extends LinearLayout { class ItemView extends LinearLayout {
static private final HashMap ourIconMap = new HashMap(); static private final HashMap ourIconMap = new HashMap();

4
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java
View file

@ -1,9 +1,9 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.dialogs.ZLBooleanOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLBooleanOptionEntry;
class ZLAndroidBooleanOptionView extends ZLAndroidOptionView { class ZLAndroidBooleanOptionView extends ZLAndroidOptionView {
CheckBox myCheckBox; CheckBox myCheckBox;

4
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java
View file

@ -1,10 +1,10 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.content.Context; import android.content.Context;
import android.view.View; import android.view.View;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.dialogs.ZLChoiceOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLChoiceOptionEntry;
class ZLAndroidChoiceOptionView extends ZLAndroidOptionView { class ZLAndroidChoiceOptionView extends ZLAndroidOptionView {
RadioGroup myGroup; RadioGroup myGroup;

8
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java
View file

@ -1,12 +1,12 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.content.Context; import android.content.Context;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.util.ZLColor; import org.geometerplus.zlibrary.core.util.ZLColor;
import org.zlibrary.core.dialogs.ZLColorOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLColorOptionEntry;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
class ZLAndroidColorOptionView extends ZLAndroidOptionView { class ZLAndroidColorOptionView extends ZLAndroidOptionView {
private View myContainer; private View myContainer;

4
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java
View file

@ -1,11 +1,11 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.content.Context; import android.content.Context;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import android.database.DataSetObserver; import android.database.DataSetObserver;
import org.zlibrary.core.dialogs.ZLComboOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry;
class ZLAndroidComboOptionView extends ZLAndroidOptionView { class ZLAndroidComboOptionView extends ZLAndroidOptionView {
private Spinner mySpinner; private Spinner mySpinner;

8
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialog.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialog.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.os.Handler; import android.os.Handler;
@ -6,10 +6,10 @@ import android.content.Context;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.zlibrary.ui.android.library.ZLAndroidLibrary; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;
class ZLAndroidDialog extends ZLDialog { class ZLAndroidDialog extends ZLDialog {
private final AndroidDialog myDialog; private final AndroidDialog myDialog;

8
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import java.util.ArrayList; import java.util.ArrayList;
@ -6,9 +6,9 @@ import android.content.Context;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.zlibrary.core.util.ZLArrayUtils; import org.geometerplus.zlibrary.core.util.ZLArrayUtils;
class ZLAndroidDialogContent extends ZLDialogContent { class ZLAndroidDialogContent extends ZLDialogContent {
private final ListView myListView; private final ListView myListView;

12
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
View file

@ -1,16 +1,16 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.app.*; import android.app.*;
import android.view.View; import android.view.View;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import org.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.zlibrary.ui.android.application.ZLAndroidApplicationWindow; import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow;
import org.zlibrary.ui.android.library.*; import org.geometerplus.zlibrary.ui.android.library.*;
public class ZLAndroidDialogManager extends ZLDialogManager { public class ZLAndroidDialogManager extends ZLDialogManager {
private final Activity myActivity; private final Activity myActivity;

6
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java
View file

@ -1,9 +1,9 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.view.View; import android.view.View;
import org.zlibrary.core.dialogs.ZLOptionView; import org.geometerplus.zlibrary.core.dialogs.ZLOptionView;
import org.zlibrary.core.dialogs.ZLOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry;
abstract class ZLAndroidOptionView extends ZLOptionView { abstract class ZLAndroidOptionView extends ZLOptionView {
ZLAndroidDialogContent myTab; ZLAndroidDialogContent myTab;

6
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import java.util.ArrayList; import java.util.ArrayList;
@ -6,8 +6,8 @@ import android.content.Context;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
class ZLAndroidOptionsDialog extends ZLOptionsDialog { class ZLAndroidOptionsDialog extends ZLOptionsDialog {
private final AndroidDialog myDialog; private final AndroidDialog myDialog;

8
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidSelectionDialog.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSelectionDialog.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.content.Context; import android.content.Context;
import android.app.Dialog; import android.app.Dialog;
@ -6,9 +6,9 @@ import android.os.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.dialogs.ZLSelectionDialog; import org.geometerplus.zlibrary.core.dialogs.ZLSelectionDialog;
import org.zlibrary.core.dialogs.ZLTreeHandler; import org.geometerplus.zlibrary.core.dialogs.ZLTreeHandler;
import org.zlibrary.core.dialogs.ZLTreeNode; import org.geometerplus.zlibrary.core.dialogs.ZLTreeNode;
class ZLAndroidSelectionDialog extends ZLSelectionDialog { class ZLAndroidSelectionDialog extends ZLSelectionDialog {
private boolean myReturnValue = false; private boolean myReturnValue = false;

4
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java
View file

@ -1,10 +1,10 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.content.Context; import android.content.Context;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.dialogs.ZLSpinOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLSpinOptionEntry;
class ZLAndroidSpinOptionView extends ZLAndroidOptionView { class ZLAndroidSpinOptionView extends ZLAndroidOptionView {
private TextView myLabel; private TextView myLabel;

4
platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java → platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java
View file

@ -1,10 +1,10 @@
package org.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.dialogs;
import android.content.Context; import android.content.Context;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import org.zlibrary.core.dialogs.ZLStringOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLStringOptionEntry;
class ZLAndroidStringOptionView extends ZLAndroidOptionView { class ZLAndroidStringOptionView extends ZLAndroidOptionView {
private TextView myLabel; private TextView myLabel;

4
platform/android/src/org/zlibrary/ui/android/image/ZLAndroidImageData.java → platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java
View file

@ -1,8 +1,8 @@
package org.zlibrary.ui.android.image; package org.geometerplus.zlibrary.ui.android.image;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import org.zlibrary.core.image.ZLImageData; import org.geometerplus.zlibrary.core.image.ZLImageData;
public final class ZLAndroidImageData implements ZLImageData { public final class ZLAndroidImageData implements ZLImageData {
private Bitmap myBitmap; private Bitmap myBitmap;

6
platform/android/src/org/zlibrary/ui/android/image/ZLAndroidImageManager.java → platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java
View file

@ -1,9 +1,9 @@
package org.zlibrary.ui.android.image; package org.geometerplus.zlibrary.ui.android.image;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import org.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.image.ZLImage;
import org.zlibrary.core.image.ZLImageManager; import org.geometerplus.zlibrary.core.image.ZLImageManager;
public final class ZLAndroidImageManager extends ZLImageManager { public final class ZLAndroidImageManager extends ZLImageManager {
public ZLAndroidImageData getImageData(ZLImage image) { public ZLAndroidImageData getImageData(ZLImage image) {

9
platform/android/src/org/zlibrary/ui/android/library/ZLAndroidActivity.java → platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
View file

@ -1,18 +1,15 @@
package org.zlibrary.ui.android.library; package org.geometerplus.zlibrary.ui.android.library;
import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.view.*; import android.view.*;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.zlibrary.ui.android.util.ZLAndroidKeyUtil; import org.geometerplus.zlibrary.ui.android.util.ZLAndroidKeyUtil;
public class ZLAndroidActivity extends Activity { public class ZLAndroidActivity extends Activity {
public static long StartTime;
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
StartTime = System.currentTimeMillis();
super.onCreate(icicle); super.onCreate(icicle);
//requestWindowFeature(Window.FEATURE_NO_TITLE); //requestWindowFeature(Window.FEATURE_NO_TITLE);
//getWindow().setFlags(WindowManager.LayoutParams.NO_STATUS_BAR_FLAG, WindowManager.LayoutParams.NO_STATUS_BAR_FLAG); //getWindow().setFlags(WindowManager.LayoutParams.NO_STATUS_BAR_FLAG, WindowManager.LayoutParams.NO_STATUS_BAR_FLAG);

22
platform/android/src/org/zlibrary/ui/android/library/ZLAndroidLibrary.java → platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.android.library; package org.geometerplus.zlibrary.ui.android.library;
import java.io.*; import java.io.*;
@ -6,18 +6,18 @@ import android.content.Resources;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import org.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.library.ZLibrary;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
//import org.zlibrary.core.xml.sax.ZLSaxXMLProcessorFactory; //import org.geometerplus.zlibrary.core.xml.sax.ZLSaxXMLProcessorFactory;
import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory;
import org.zlibrary.core.sqliteconfig.ZLSQLiteConfigManager; import org.geometerplus.zlibrary.core.sqliteconfig.ZLSQLiteConfigManager;
import org.zlibrary.ui.android.view.ZLAndroidPaintContext; import org.geometerplus.zlibrary.ui.android.view.ZLAndroidPaintContext;
import org.zlibrary.ui.android.view.ZLAndroidWidget; import org.geometerplus.zlibrary.ui.android.view.ZLAndroidWidget;
import org.zlibrary.ui.android.application.ZLAndroidApplicationWindow; import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow;
import org.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager;
import org.zlibrary.ui.android.image.ZLAndroidImageManager; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager;
public final class ZLAndroidLibrary extends ZLibrary { public final class ZLAndroidLibrary extends ZLibrary {
private ZLAndroidActivity myActivity; private ZLAndroidActivity myActivity;

2
platform/android/src/org/zlibrary/ui/android/util/ZLAndroidKeyUtil.java → platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.android.util; package org.geometerplus.zlibrary.ui.android.util;
import android.view.KeyEvent; import android.view.KeyEvent;

12
platform/android/src/org/zlibrary/ui/android/view/ZLAndroidPaintContext.java → platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
View file

@ -1,16 +1,16 @@
package org.zlibrary.ui.android.view; package org.geometerplus.zlibrary.ui.android.view;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import android.graphics.*; import android.graphics.*;
import org.zlibrary.core.image.ZLImageData; import org.geometerplus.zlibrary.core.image.ZLImageData;
import org.zlibrary.core.util.ZLColor; import org.geometerplus.zlibrary.core.util.ZLColor;
import org.zlibrary.core.view.ZLPaintContext; import org.geometerplus.zlibrary.core.view.ZLPaintContext;
import org.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.core.view.ZLViewWidget;
import org.zlibrary.ui.android.image.ZLAndroidImageData; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData;
public final class ZLAndroidPaintContext extends ZLPaintContext { public final class ZLAndroidPaintContext extends ZLPaintContext {
private Canvas myCanvas; private Canvas myCanvas;

8
platform/android/src/org/zlibrary/ui/android/view/ZLAndroidViewWidget.java → platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java
View file

@ -1,9 +1,9 @@
package org.zlibrary.ui.android.view; package org.geometerplus.zlibrary.ui.android.view;
import org.zlibrary.core.view.ZLView; import org.geometerplus.zlibrary.core.view.ZLView;
import org.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.core.view.ZLViewWidget;
import org.zlibrary.ui.android.library.ZLAndroidLibrary; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;
public class ZLAndroidViewWidget extends ZLViewWidget { public class ZLAndroidViewWidget extends ZLViewWidget {
private final ZLAndroidWidget myWidget = private final ZLAndroidWidget myWidget =

18
platform/android/src/org/zlibrary/ui/android/view/ZLAndroidWidget.java → platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.android.view; package org.geometerplus.zlibrary.ui.android.view;
import java.util.Map; import java.util.Map;
@ -7,10 +7,10 @@ import android.graphics.Canvas;
import android.view.*; import android.view.*;
import android.util.AttributeSet; import android.util.AttributeSet;
import org.zlibrary.core.view.ZLView; import org.geometerplus.zlibrary.core.view.ZLView;
import org.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.core.view.ZLViewWidget;
import org.zlibrary.ui.android.util.ZLAndroidKeyUtil; import org.geometerplus.zlibrary.ui.android.util.ZLAndroidKeyUtil;
public class ZLAndroidWidget extends View { public class ZLAndroidWidget extends View {
private final ZLAndroidPaintContext myPaintContext = new ZLAndroidPaintContext(); private final ZLAndroidPaintContext myPaintContext = new ZLAndroidPaintContext();
@ -34,8 +34,6 @@ public class ZLAndroidWidget extends View {
myViewWidget = viewWidget; myViewWidget = viewWidget;
} }
private long myTime;
public void onDraw(Canvas canvas) { public void onDraw(Canvas canvas) {
super.onDraw(canvas); super.onDraw(canvas);
if (myViewWidget == null) { if (myViewWidget == null) {
@ -71,14 +69,6 @@ public class ZLAndroidWidget extends View {
break; break;
} }
view.paint(); view.paint();
if (myTime == 0) {
//myTime = org.fbreader.formats.fb2.FB2Reader.LoadingTime;
myTime = System.currentTimeMillis() - org.zlibrary.ui.android.library.ZLAndroidActivity.StartTime;
} else {
myTime = System.currentTimeMillis() - start;
}
String sTime = "" + myTime;
myPaintContext.drawString(240, 140, sTime.toCharArray(), 0, sTime.length());
myPaintContext.endPaint(); myPaintContext.endPaint();
} }

2
platform/j2me/FBReaderJ.jad
View file

@ -1,4 +1,4 @@
MIDlet-1: FBReaderJ, /data/FBReaderJ.png, org.zlibrary.ui.j2me.library.ZLMIDlet MIDlet-1: FBReaderJ, /data/FBReaderJ.png, org.geometerplus.zlibrary.ui.j2me.library.ZLMIDlet
MIDlet-Description: E-book reader MIDlet-Description: E-book reader
MIDlet-Jar-URL: FBReaderJ.jar MIDlet-Jar-URL: FBReaderJ.jar
MIDlet-Name: FBReaderJ MIDlet-Name: FBReaderJ

4
platform/j2me/build.xml
View file

@ -33,7 +33,7 @@
<target name="compile" depends="prepare"> <target name="compile" depends="prepare">
<wtkbuild srcdir="${src.path}" destdir="${bin.dir}"> <wtkbuild srcdir="${src.path}" destdir="${bin.dir}">
<exclude name="org/zlibrary/core/xml/sax/**"/> <exclude name="org/geometerplus/zlibrary/core/xml/sax/**"/>
</wtkbuild> </wtkbuild>
</target> </target>
@ -42,7 +42,7 @@
<fileset dir="${bin.dir}" includes="**/*.class"/> <fileset dir="${bin.dir}" includes="**/*.class"/>
<fileset dir="${project.dir}" includes="data/**"/> <fileset dir="${project.dir}" includes="data/**"/>
<fileset dir="${platform.dir}" includes="data/**"/> <fileset dir="${platform.dir}" includes="data/**"/>
<preserve class="org.fbreader.fbreader.FBReader"/> <preserve class="org.geometerplus.fbreader.fbreader.FBReader"/>
</wtkpackage> </wtkpackage>
</target> </target>
</project> </project>

2
platform/j2me/manifest.mf
View file

@ -1,4 +1,4 @@
MIDlet-1: FBReaderJ, /data/FBReaderJ.png, org.zlibrary.ui.j2me.library.ZLMIDlet MIDlet-1: FBReaderJ, /data/FBReaderJ.png, org.geometerplus.zlibrary.ui.j2me.library.ZLMIDlet
MIDlet-Description: E-book reader MIDlet-Description: E-book reader
MIDlet-Name: FBReaderJ MIDlet-Name: FBReaderJ
MIDlet-Vendor: Geometer Plus MIDlet-Vendor: Geometer Plus

2
platform/j2me/src/java/util/zip/ZipFile.java
View file

@ -4,7 +4,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Enumeration; import java.util.Enumeration;
import org.zlibrary.core.util.File; import org.geometerplus.zlibrary.core.util.File;
public class ZipFile { public class ZipFile {
public ZipFile(String name) throws IOException { public ZipFile(String name) throws IOException {

2
platform/j2me/src/org/zlibrary/core/util/ArrayList.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.util; package org.geometerplus.zlibrary.core.util;
import java.util.Vector; import java.util.Vector;

2
platform/j2me/src/org/zlibrary/core/util/Collections.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.util; package org.geometerplus.zlibrary.core.util;
public abstract class Collections { public abstract class Collections {
public static void sort(ArrayList list, Comparator comparator) { public static void sort(ArrayList list, Comparator comparator) {

2
platform/j2me/src/org/zlibrary/core/util/Comparator.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.util; package org.geometerplus.zlibrary.core.util;
public interface Comparator { public interface Comparator {
int compare(Object object0, Object object1); int compare(Object object0, Object object1);

2
platform/j2me/src/org/zlibrary/core/util/File.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.util; package org.geometerplus.zlibrary.core.util;
import java.io.IOException; import java.io.IOException;

2
platform/j2me/src/org/zlibrary/core/util/HashMap.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.util; package org.geometerplus.zlibrary.core.util;
import java.util.Hashtable; import java.util.Hashtable;

2
platform/j2me/src/org/zlibrary/core/util/Locale.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.util; package org.geometerplus.zlibrary.core.util;
public final class Locale { public final class Locale {
static private Locale ourDefaultLocale; static private Locale ourDefaultLocale;

8
platform/j2me/src/org/zlibrary/ui/j2me/application/ZLJ2MEApplicationWindow.java
View file

@ -1,9 +1,9 @@
package org.zlibrary.ui.j2me.application; package org.geometerplus.zlibrary.ui.j2me.application;
import org.zlibrary.core.application.*; import org.geometerplus.zlibrary.core.application.*;
import org.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.core.view.ZLViewWidget;
import org.zlibrary.ui.j2me.view.*; import org.geometerplus.zlibrary.ui.j2me.view.*;
public class ZLJ2MEApplicationWindow extends ZLApplicationWindow { public class ZLJ2MEApplicationWindow extends ZLApplicationWindow {
private final ZLCanvas myCanvas; private final ZLCanvas myCanvas;

4
platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfig.java
View file

@ -1,6 +1,6 @@
package org.zlibrary.ui.j2me.config; package org.geometerplus.zlibrary.ui.j2me.config;
import org.zlibrary.core.config.ZLConfig; import org.geometerplus.zlibrary.core.config.ZLConfig;
class ZLJ2MEConfig implements ZLConfig { class ZLJ2MEConfig implements ZLConfig {
public void removeGroup(String name) { public void removeGroup(String name) {

6
platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfigManager.java
View file

@ -1,7 +1,7 @@
package org.zlibrary.ui.j2me.config; package org.geometerplus.zlibrary.ui.j2me.config;
import org.zlibrary.core.config.ZLConfig; import org.geometerplus.zlibrary.core.config.ZLConfig;
import org.zlibrary.core.config.ZLConfigManager; import org.geometerplus.zlibrary.core.config.ZLConfigManager;
public class ZLJ2MEConfigManager extends ZLConfigManager { public class ZLJ2MEConfigManager extends ZLConfigManager {
public ZLJ2MEConfigManager() { public ZLJ2MEConfigManager() {

4
platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageData.java
View file

@ -1,8 +1,8 @@
package org.zlibrary.ui.j2me.image; package org.geometerplus.zlibrary.ui.j2me.image;
import javax.microedition.lcdui.Image; import javax.microedition.lcdui.Image;
import org.zlibrary.core.image.ZLImageData; import org.geometerplus.zlibrary.core.image.ZLImageData;
public final class ZLJ2MEImageData implements ZLImageData { public final class ZLJ2MEImageData implements ZLImageData {
private Image myImage; private Image myImage;

4
platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageManager.java
View file

@ -1,8 +1,8 @@
package org.zlibrary.ui.j2me.image; package org.geometerplus.zlibrary.ui.j2me.image;
import javax.microedition.lcdui.Image; import javax.microedition.lcdui.Image;
import org.zlibrary.core.image.*; import org.geometerplus.zlibrary.core.image.*;
public final class ZLJ2MEImageManager extends ZLImageManager { public final class ZLJ2MEImageManager extends ZLImageManager {
public ZLImageData getImageData(ZLImage image) { public ZLImageData getImageData(ZLImage image) {

18
platform/j2me/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.j2me.library; package org.geometerplus.zlibrary.ui.j2me.library;
import java.io.InputStream; import java.io.InputStream;
import javax.microedition.io.Connector; import javax.microedition.io.Connector;
@ -7,16 +7,16 @@ import javax.microedition.io.file.*;
import javax.microedition.midlet.MIDlet; import javax.microedition.midlet.MIDlet;
import javax.microedition.lcdui.Display; import javax.microedition.lcdui.Display;
import org.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.library.ZLibrary;
import org.zlibrary.core.view.ZLPaintContext; import org.geometerplus.zlibrary.core.view.ZLPaintContext;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory;
import org.zlibrary.ui.j2me.config.ZLJ2MEConfigManager; import org.geometerplus.zlibrary.ui.j2me.config.ZLJ2MEConfigManager;
import org.zlibrary.ui.j2me.view.ZLCanvas; import org.geometerplus.zlibrary.ui.j2me.view.ZLCanvas;
import org.zlibrary.ui.j2me.application.ZLJ2MEApplicationWindow; import org.geometerplus.zlibrary.ui.j2me.application.ZLJ2MEApplicationWindow;
import org.zlibrary.ui.j2me.image.ZLJ2MEImageManager; import org.geometerplus.zlibrary.ui.j2me.image.ZLJ2MEImageManager;
final class ZLJ2MELibrary extends ZLibrary { final class ZLJ2MELibrary extends ZLibrary {
private ZLCanvas myCanvas; private ZLCanvas myCanvas;

2
platform/j2me/src/org/zlibrary/ui/j2me/library/ZLMIDlet.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.j2me.library; package org.geometerplus.zlibrary.ui.j2me.library;
import javax.microedition.midlet.MIDlet; import javax.microedition.midlet.MIDlet;
import javax.microedition.lcdui.*; import javax.microedition.lcdui.*;

6
platform/j2me/src/org/zlibrary/ui/j2me/view/ZLCanvas.java
View file

@ -1,9 +1,9 @@
package org.zlibrary.ui.j2me.view; package org.geometerplus.zlibrary.ui.j2me.view;
import javax.microedition.lcdui.*; import javax.microedition.lcdui.*;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.zlibrary.core.view.ZLPaintContext; import org.geometerplus.zlibrary.core.view.ZLPaintContext;
public class ZLCanvas extends Canvas { public class ZLCanvas extends Canvas {
private final ZLJ2MEPaintContext myContext = new ZLJ2MEPaintContext(this); private final ZLJ2MEPaintContext myContext = new ZLJ2MEPaintContext(this);

10
platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEPaintContext.java
View file

@ -1,12 +1,12 @@
package org.zlibrary.ui.j2me.view; package org.geometerplus.zlibrary.ui.j2me.view;
import javax.microedition.lcdui.*; import javax.microedition.lcdui.*;
import org.zlibrary.core.util.ZLColor; import org.geometerplus.zlibrary.core.util.ZLColor;
import org.zlibrary.core.image.ZLImageData; import org.geometerplus.zlibrary.core.image.ZLImageData;
import org.zlibrary.ui.j2me.image.ZLJ2MEImageData; import org.geometerplus.zlibrary.ui.j2me.image.ZLJ2MEImageData;
import org.zlibrary.core.view.ZLPaintContext; import org.geometerplus.zlibrary.core.view.ZLPaintContext;
class ZLJ2MEPaintContext extends ZLPaintContext { class ZLJ2MEPaintContext extends ZLPaintContext {
private final Canvas myCanvas; private final Canvas myCanvas;

4
platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEViewWidget.java
View file

@ -1,6 +1,6 @@
package org.zlibrary.ui.j2me.view; package org.geometerplus.zlibrary.ui.j2me.view;
import org.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.core.view.ZLViewWidget;
public class ZLJ2MEViewWidget extends ZLViewWidget { public class ZLJ2MEViewWidget extends ZLViewWidget {
private final ZLCanvas myCanvas; private final ZLCanvas myCanvas;

4
platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigImpl.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigImpl.java
View file

@ -1,8 +1,8 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
import java.util.*; import java.util.*;
import org.zlibrary.core.config.ZLConfig; import org.geometerplus.zlibrary.core.config.ZLConfig;
final class ZLConfigImpl implements ZLConfig { final class ZLConfigImpl implements ZLConfig {

4
platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigReader.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigReader.java
View file

@ -1,9 +1,9 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
import java.io.*; import java.io.*;
import java.util.Map; import java.util.Map;
import org.zlibrary.core.xml.*; import org.geometerplus.zlibrary.core.xml.*;
final class ZLConfigReader implements ZLReader { final class ZLConfigReader implements ZLReader {
private class ConfigReader extends ZLXMLReaderAdapter { private class ConfigReader extends ZLXMLReaderAdapter {

2
platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigWriter.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigWriter.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;

2
platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
import java.util.*; import java.util.*;

2
platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeltaConfig.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeltaConfig.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
import java.util.*; import java.util.*;

2
platform/swing/src/org/zlibrary/core/xmlconfig/ZLGroup.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLGroup.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
import java.util.Set; import java.util.Set;
import java.util.HashMap; import java.util.HashMap;

2
platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionID.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionID.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
final class ZLOptionID { final class ZLOptionID {
private String myGroup = ""; private String myGroup = "";

2
platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionInfo.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionInfo.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
final class ZLOptionInfo { final class ZLOptionInfo {
private String myValue; private String myValue;

5
platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLReader.java Normal file
View file

@ -0,0 +1,5 @@
package org.geometerplus.zlibrary.core.xmlconfig;
public interface ZLReader {
public void read();
}

2
platform/swing/src/org/zlibrary/core/xmlconfig/ZLSimpleConfig.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLSimpleConfig.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
import java.util.Set; import java.util.Set;
import java.util.HashMap; import java.util.HashMap;

2
platform/swing/src/org/zlibrary/core/xmlconfig/ZLWriter.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLWriter.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
public interface ZLWriter { public interface ZLWriter {
public void write(); public void write();

4
platform/swing/src/org/zlibrary/core/xmlconfig/ZLXMLConfigManager.java → platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLXMLConfigManager.java
View file

@ -1,6 +1,6 @@
package org.zlibrary.core.xmlconfig; package org.geometerplus.zlibrary.core.xmlconfig;
import org.zlibrary.core.config.*; import org.geometerplus.zlibrary.core.config.*;
public class ZLXMLConfigManager extends ZLConfigManager { public class ZLXMLConfigManager extends ZLConfigManager {
private String myDirectoryPath; private String myDirectoryPath;

16
platform/swing/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.application; package org.geometerplus.zlibrary.ui.swing.application;
import java.util.HashMap; import java.util.HashMap;
import java.util.Stack; import java.util.Stack;
@ -7,13 +7,13 @@ import java.awt.*;
import java.awt.event.*; import java.awt.event.*;
import javax.swing.*; import javax.swing.*;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.zlibrary.core.application.ZLApplicationWindow; import org.geometerplus.zlibrary.core.application.ZLApplicationWindow;
import org.zlibrary.core.options.ZLIntegerRangeOption; import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;
import org.zlibrary.core.options.ZLOption; import org.geometerplus.zlibrary.core.options.ZLOption;
import org.zlibrary.ui.swing.library.ZLSwingLibrary; import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary;
import org.zlibrary.ui.swing.view.ZLSwingViewWidget; import org.geometerplus.zlibrary.ui.swing.view.ZLSwingViewWidget;
import org.zlibrary.ui.swing.util.ZLSwingIconUtil; import org.geometerplus.zlibrary.ui.swing.util.ZLSwingIconUtil;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ZLSwingApplicationWindow extends ZLApplicationWindow { public class ZLSwingApplicationWindow extends ZLApplicationWindow {

6
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.Component; import java.awt.Component;
import java.awt.Graphics; import java.awt.Graphics;
@ -24,8 +24,8 @@ import javax.swing.plaf.ActionMapUIResource;
import javax.swing.plaf.UIResource; import javax.swing.plaf.UIResource;
import javax.swing.plaf.metal.MetalLookAndFeel; import javax.swing.plaf.metal.MetalLookAndFeel;
import org.zlibrary.core.dialogs.ZLBoolean3OptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLBoolean3OptionEntry;
import org.zlibrary.core.util.ZLBoolean3; import org.geometerplus.zlibrary.core.util.ZLBoolean3;
public class ZLBoolean3OptionView extends ZLSwingOptionView { public class ZLBoolean3OptionView extends ZLSwingOptionView {
private TristateCheckBox myTristateCheckBox; private TristateCheckBox myTristateCheckBox;

4
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
@ -8,7 +8,7 @@ import javax.swing.JCheckBox;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import org.zlibrary.core.dialogs.ZLBooleanOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLBooleanOptionEntry;
public class ZLBooleanOptionView extends ZLSwingOptionView { public class ZLBooleanOptionView extends ZLSwingOptionView {
private JCheckBox myCheckBox; private JCheckBox myCheckBox;

4
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
@ -11,7 +11,7 @@ import javax.swing.JPanel;
import javax.swing.JRadioButton; import javax.swing.JRadioButton;
import javax.swing.border.TitledBorder; import javax.swing.border.TitledBorder;
import org.zlibrary.core.dialogs.ZLChoiceOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLChoiceOptionEntry;
public class ZLChoiceOptionView extends ZLSwingOptionView { public class ZLChoiceOptionView extends ZLSwingOptionView {
private final ButtonGroup myButtonGroup = new ButtonGroup(); private final ButtonGroup myButtonGroup = new ButtonGroup();

8
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLColorOptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLColorOptionView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@ -7,9 +7,9 @@ import java.util.LinkedHashMap;
import javax.swing.*; import javax.swing.*;
import org.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.zlibrary.core.util.ZLColor; import org.geometerplus.zlibrary.core.util.ZLColor;
public class ZLColorOptionView extends ZLSwingOptionView { public class ZLColorOptionView extends ZLSwingOptionView {
private JComboBox myStandardColorComboBox; private JComboBox myStandardColorComboBox;

4
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLComboOptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLComboOptionView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.util.ArrayList; import java.util.ArrayList;
@ -6,7 +6,7 @@ import java.awt.*;
import java.awt.event.*; import java.awt.event.*;
import javax.swing.*; import javax.swing.*;
import org.zlibrary.core.dialogs.ZLComboOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry;
public class ZLComboOptionView extends ZLSwingOptionView { public class ZLComboOptionView extends ZLSwingOptionView {
private JComboBox myComboBox; private JComboBox myComboBox;

6
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
@ -20,8 +20,8 @@ import javax.swing.text.BadLocationException;
import javax.swing.text.Document; import javax.swing.text.Document;
import javax.swing.text.PlainDocument; import javax.swing.text.PlainDocument;
import org.zlibrary.core.dialogs.ZLKeyOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLKeyOptionEntry;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
public class ZLKeyOptionView extends ZLSwingOptionView { public class ZLKeyOptionView extends ZLSwingOptionView {
private JComboBox myComboBox; private JComboBox myComboBox;

4
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
@ -11,7 +11,7 @@ import javax.swing.JPanel;
import javax.swing.JSpinner; import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import org.zlibrary.core.dialogs.ZLSpinOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLSpinOptionEntry;
public class ZLSpinOptionView extends ZLSwingOptionView { public class ZLSpinOptionView extends ZLSwingOptionView {
private JSpinner mySpinner; private JSpinner mySpinner;

6
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLStringOptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLStringOptionView.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
@ -13,8 +13,8 @@ import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JTextField; import javax.swing.JTextField;
import org.zlibrary.core.dialogs.ZLStringOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLStringOptionEntry;
import org.zlibrary.core.dialogs.ZLTextOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLTextOptionEntry;
public class ZLStringOptionView extends ZLSwingOptionView { public class ZLStringOptionView extends ZLSwingOptionView {
private JLabel myLabel; private JLabel myLabel;

12
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialog.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialog.java
View file

@ -1,10 +1,10 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import org.zlibrary.core.dialogs.ZLDialog; import org.geometerplus.zlibrary.core.dialogs.ZLDialog;
import org.zlibrary.core.dialogs.ZLDialogManager; import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.zlibrary.core.options.ZLIntegerRangeOption; import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;
import org.zlibrary.core.options.ZLOption; import org.geometerplus.zlibrary.core.options.ZLOption;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;

6
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
@ -8,8 +8,8 @@ import javax.swing.BorderFactory;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JPanel; import javax.swing.JPanel;
import org.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
public class ZLSwingDialogContent extends ZLDialogContent { public class ZLSwingDialogContent extends ZLDialogContent {
private final JPanel myContentPanel = new JPanel(); private final JPanel myContentPanel = new JPanel();

8
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
@ -7,9 +7,9 @@ import java.awt.event.WindowEvent;
import javax.swing.*; import javax.swing.*;
import org.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.zlibrary.ui.swing.application.ZLSwingApplicationWindow; import org.geometerplus.zlibrary.ui.swing.application.ZLSwingApplicationWindow;
public class ZLSwingDialogManager extends ZLDialogManager { public class ZLSwingDialogManager extends ZLDialogManager {
private ZLSwingApplicationWindow myApplicationWindow; private ZLSwingApplicationWindow myApplicationWindow;

6
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java
View file

@ -1,12 +1,12 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
import javax.swing.JComponent; import javax.swing.JComponent;
import org.zlibrary.core.dialogs.ZLOptionEntry; import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry;
import org.zlibrary.core.dialogs.ZLOptionView; import org.geometerplus.zlibrary.core.dialogs.ZLOptionView;
public abstract class ZLSwingOptionView extends ZLOptionView { public abstract class ZLSwingOptionView extends ZLOptionView {
protected final ZLSwingDialogContent myTab; protected final ZLSwingDialogContent myTab;

8
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.util.*; import java.util.*;
import java.awt.*; import java.awt.*;
@ -7,9 +7,9 @@ import java.awt.event.*;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.*; import javax.swing.event.*;
import org.zlibrary.core.options.*; import org.geometerplus.zlibrary.core.options.*;
import org.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
public class ZLSwingOptionsDialog extends ZLOptionsDialog { public class ZLSwingOptionsDialog extends ZLOptionsDialog {
private final boolean myShowApplyButton; private final boolean myShowApplyButton;

14
platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.dialogs; package org.geometerplus.zlibrary.ui.swing.dialogs;
import java.util.HashMap; import java.util.HashMap;
import java.awt.*; import java.awt.*;
@ -7,12 +7,12 @@ import java.awt.event.*;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.*; import javax.swing.event.*;
import org.zlibrary.core.dialogs.ZLSelectionDialog; import org.geometerplus.zlibrary.core.dialogs.ZLSelectionDialog;
import org.zlibrary.core.dialogs.ZLTreeHandler; import org.geometerplus.zlibrary.core.dialogs.ZLTreeHandler;
import org.zlibrary.core.dialogs.ZLTreeNode; import org.geometerplus.zlibrary.core.dialogs.ZLTreeNode;
import org.zlibrary.core.options.ZLIntegerRangeOption; import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;
import org.zlibrary.core.options.ZLOption; import org.geometerplus.zlibrary.core.options.ZLOption;
import org.zlibrary.ui.swing.util.ZLSwingIconUtil; import org.geometerplus.zlibrary.ui.swing.util.ZLSwingIconUtil;
class ZLSwingSelectionDialog extends ZLSelectionDialog { class ZLSwingSelectionDialog extends ZLSelectionDialog {
private static final String OPTION_GROUP_NAME = "OpenFileDialog"; private static final String OPTION_GROUP_NAME = "OpenFileDialog";

4
platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageData.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageData.java
View file

@ -1,8 +1,8 @@
package org.zlibrary.ui.swing.image; package org.geometerplus.zlibrary.ui.swing.image;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import org.zlibrary.core.image.ZLImageData; import org.geometerplus.zlibrary.core.image.ZLImageData;
public final class ZLSwingImageData implements ZLImageData { public final class ZLSwingImageData implements ZLImageData {
private final BufferedImage myImage; private final BufferedImage myImage;

6
platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageManager.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageManager.java
View file

@ -1,12 +1,12 @@
package org.zlibrary.ui.swing.image; package org.geometerplus.zlibrary.ui.swing.image;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import org.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.image.ZLImage;
import org.zlibrary.core.image.ZLImageManager; import org.geometerplus.zlibrary.core.image.ZLImageManager;
public final class ZLSwingImageManager extends ZLImageManager { public final class ZLSwingImageManager extends ZLImageManager {
public ZLSwingImageData getImageData(ZLImage image) { public ZLSwingImageData getImageData(ZLImage image) {

2
platform/swing/src/org/zlibrary/ui/swing/library/Main.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/Main.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.library; package org.geometerplus.zlibrary.ui.swing.library;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

22
platform/swing/src/org/zlibrary/ui/swing/library/ZLSwingLibrary.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/ZLSwingLibrary.java
View file

@ -1,20 +1,20 @@
package org.zlibrary.ui.swing.library; package org.geometerplus.zlibrary.ui.swing.library;
import java.io.*; import java.io.*;
import javax.swing.UIManager; import javax.swing.UIManager;
import org.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.library.ZLibrary;
import org.zlibrary.core.xmlconfig.ZLXMLConfigManager; import org.geometerplus.zlibrary.core.xmlconfig.ZLXMLConfigManager;
import org.zlibrary.core.application.ZLApplication; import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.zlibrary.core.dialogs.ZLDialogManager; import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager;
import org.zlibrary.core.html.own.ZLOwnHtmlProcessorFactory; import org.geometerplus.zlibrary.core.html.own.ZLOwnHtmlProcessorFactory;
import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory;
import org.zlibrary.ui.swing.view.ZLSwingPaintContext; import org.geometerplus.zlibrary.ui.swing.view.ZLSwingPaintContext;
import org.zlibrary.ui.swing.application.ZLSwingApplicationWindow; import org.geometerplus.zlibrary.ui.swing.application.ZLSwingApplicationWindow;
import org.zlibrary.ui.swing.dialogs.ZLSwingDialogManager; import org.geometerplus.zlibrary.ui.swing.dialogs.ZLSwingDialogManager;
import org.zlibrary.ui.swing.image.ZLSwingImageManager; import org.geometerplus.zlibrary.ui.swing.image.ZLSwingImageManager;
public class ZLSwingLibrary extends ZLibrary { public class ZLSwingLibrary extends ZLibrary {
public ZLSwingPaintContext createPaintContext() { public ZLSwingPaintContext createPaintContext() {

2
platform/swing/src/org/zlibrary/ui/swing/util/ZLSwingIconUtil.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/util/ZLSwingIconUtil.java
View file

@ -1,4 +1,4 @@
package org.zlibrary.ui.swing.util; package org.geometerplus.zlibrary.ui.swing.util;
import java.net.URL; import java.net.URL;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;

12
platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingPaintContext.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingPaintContext.java
View file

@ -1,14 +1,14 @@
package org.zlibrary.ui.swing.view; package org.geometerplus.zlibrary.ui.swing.view;
import java.util.*; import java.util.*;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import org.zlibrary.core.image.ZLImageData; import org.geometerplus.zlibrary.core.image.ZLImageData;
import org.zlibrary.core.util.ZLColor; import org.geometerplus.zlibrary.core.util.ZLColor;
import org.zlibrary.core.view.ZLPaintContext; import org.geometerplus.zlibrary.core.view.ZLPaintContext;
import org.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.core.view.ZLViewWidget;
import org.zlibrary.ui.swing.image.ZLSwingImageData; import org.geometerplus.zlibrary.ui.swing.image.ZLSwingImageData;
public final class ZLSwingPaintContext extends ZLPaintContext { public final class ZLSwingPaintContext extends ZLPaintContext {
private Graphics2D myGraphics; private Graphics2D myGraphics;

6
platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingViewWidget.java → platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingViewWidget.java
View file

@ -1,11 +1,11 @@
package org.zlibrary.ui.swing.view; package org.geometerplus.zlibrary.ui.swing.view;
import java.awt.*; import java.awt.*;
import java.awt.event.*; import java.awt.event.*;
import javax.swing.JPanel; import javax.swing.JPanel;
import org.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.core.view.ZLViewWidget;
import org.zlibrary.core.view.ZLView; import org.geometerplus.zlibrary.core.view.ZLView;
public final class ZLSwingViewWidget extends ZLViewWidget implements MouseListener, MouseMotionListener { public final class ZLSwingViewWidget extends ZLViewWidget implements MouseListener, MouseMotionListener {
@SuppressWarnings("serial") @SuppressWarnings("serial")

5
platform/swing/src/org/zlibrary/core/xmlconfig/ZLReader.java
View file

@ -1,5 +0,0 @@
package org.zlibrary.core.xmlconfig;
public interface ZLReader {
public void read();
}

10
src/org/fbreader/fbreader/FootnoteView.java
View file

@ -1,10 +0,0 @@
package org.fbreader.fbreader;
import org.zlibrary.core.view.ZLPaintContext;
import org.zlibrary.text.model.ZLTextModel;
public final class FootnoteView extends FBView {
FootnoteView(FBReader fbreader, ZLPaintContext context) {
super(fbreader, context);
}
}

5
src/org/fbreader/formats/EncodedTextReader.java
View file

@ -1,5 +0,0 @@
package org.fbreader.formats;
public class EncodedTextReader {
}

24
src/org/fbreader/bookmodel/BookModel.java → src/org/geometerplus/fbreader/bookmodel/BookModel.java
View file

@ -1,19 +1,19 @@
package org.fbreader.bookmodel; package org.geometerplus.fbreader.bookmodel;
import java.util.*; import java.util.*;
import org.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.*;
import org.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.image.ZLImage;
import org.zlibrary.core.image.ZLImageMap; import org.geometerplus.zlibrary.core.image.ZLImageMap;
import org.zlibrary.text.model.ZLTextModel; import org.geometerplus.zlibrary.text.model.ZLTextModel;
import org.zlibrary.text.model.ZLTextParagraph; import org.geometerplus.zlibrary.text.model.ZLTextParagraph;
import org.zlibrary.text.model.impl.ZLModelFactory; import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory;
import org.zlibrary.text.model.impl.ZLTextPlainModelImpl; import org.geometerplus.zlibrary.text.model.impl.ZLTextPlainModelImpl;
import org.fbreader.description.BookDescription; import org.geometerplus.fbreader.description.BookDescription;
import org.fbreader.formats.FormatPlugin; import org.geometerplus.fbreader.formats.FormatPlugin;
import org.fbreader.formats.FormatPlugin.PluginCollection; import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection;
public final class BookModel { public final class BookModel {
private final ZLTextPlainModelImpl myBookTextModel = new ZLTextPlainModelImpl(65536); private final ZLTextPlainModelImpl myBookTextModel = new ZLTextPlainModelImpl(65536);

16
src/org/fbreader/bookmodel/BookReader.java → src/org/geometerplus/fbreader/bookmodel/BookReader.java
View file

@ -1,14 +1,14 @@
package org.fbreader.bookmodel; package org.geometerplus.fbreader.bookmodel;
import java.util.*; import java.util.*;
import org.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.*;
import org.zlibrary.core.image.ZLImage; import org.geometerplus.zlibrary.core.image.ZLImage;
import org.zlibrary.core.util.ZLArrayUtils; import org.geometerplus.zlibrary.core.util.ZLArrayUtils;
import org.zlibrary.core.util.ZLTextBuffer; import org.geometerplus.zlibrary.core.util.ZLTextBuffer;
import org.zlibrary.text.model.ZLTextParagraph; import org.geometerplus.zlibrary.text.model.ZLTextParagraph;
import org.zlibrary.text.model.ZLTextTreeParagraph; import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph;
import org.zlibrary.text.model.impl.ZLTextPlainModelImpl; import org.geometerplus.zlibrary.text.model.impl.ZLTextPlainModelImpl;
public class BookReader { public class BookReader {
private final BookModel myBookModel; private final BookModel myBookModel;

10
src/org/fbreader/bookmodel/ContentsModel.java → src/org/geometerplus/fbreader/bookmodel/ContentsModel.java
View file

@ -1,11 +1,11 @@
package org.fbreader.bookmodel; package org.geometerplus.fbreader.bookmodel;
import java.util.*; import java.util.*;
import org.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.*;
import org.zlibrary.text.model.ZLTextTreeModel; import org.geometerplus.zlibrary.text.model.ZLTextTreeModel;
import org.zlibrary.text.model.ZLTextTreeParagraph; import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph;
import org.zlibrary.text.model.impl.ZLTextTreeModelImpl; import org.geometerplus.zlibrary.text.model.impl.ZLTextTreeModelImpl;
public class ContentsModel extends ZLTextTreeModelImpl implements ZLTextTreeModel{ public class ContentsModel extends ZLTextTreeModelImpl implements ZLTextTreeModel{
private final HashMap myReferenceByParagraph = new HashMap(); private final HashMap myReferenceByParagraph = new HashMap();

2
src/org/fbreader/bookmodel/FBTextKind.java → src/org/geometerplus/fbreader/bookmodel/FBTextKind.java
View file

@ -1,4 +1,4 @@
package org.fbreader.bookmodel; package org.geometerplus.fbreader.bookmodel;
public interface FBTextKind { public interface FBTextKind {
byte REGULAR = 0; byte REGULAR = 0;

24
src/org/fbreader/collection/BookCollection.java → src/org/geometerplus/fbreader/collection/BookCollection.java
View file

@ -1,19 +1,19 @@
package org.fbreader.collection; package org.geometerplus.fbreader.collection;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import org.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.*;
import org.fbreader.description.Author; import org.geometerplus.fbreader.description.Author;
import org.fbreader.description.BookDescription; import org.geometerplus.fbreader.description.BookDescription;
import org.fbreader.description.BookDescriptionUtil; import org.geometerplus.fbreader.description.BookDescriptionUtil;
import org.fbreader.formats.FormatPlugin.PluginCollection; import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection;
import org.zlibrary.core.filesystem.ZLDir; import org.geometerplus.zlibrary.core.filesystem.ZLDir;
import org.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.zlibrary.core.options.ZLBooleanOption; import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
import org.zlibrary.core.options.ZLIntegerRangeOption; import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;
import org.zlibrary.core.options.ZLOption; import org.geometerplus.zlibrary.core.options.ZLOption;
import org.zlibrary.core.options.ZLStringOption; import org.geometerplus.zlibrary.core.options.ZLStringOption;
public class BookCollection { public class BookCollection {
public final ZLStringOption PathOption; public final ZLStringOption PathOption;

10
src/org/fbreader/collection/BookList.java → src/org/geometerplus/fbreader/collection/BookList.java
View file

@ -1,11 +1,11 @@
package org.fbreader.collection; package org.geometerplus.fbreader.collection;
import java.util.*; import java.util.*;
import org.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.*;
import org.zlibrary.core.options.ZLIntegerOption; import org.geometerplus.zlibrary.core.options.ZLIntegerOption;
import org.zlibrary.core.options.ZLOption; import org.geometerplus.zlibrary.core.options.ZLOption;
import org.zlibrary.core.options.ZLStringOption; import org.geometerplus.zlibrary.core.options.ZLStringOption;
public class BookList { public class BookList {
private final static String GROUP = "BookList"; private final static String GROUP = "BookList";

4
src/org/fbreader/description/Author.java → src/org/geometerplus/fbreader/description/Author.java
View file

@ -1,7 +1,7 @@
package org.fbreader.description; package org.geometerplus.fbreader.description;
import java.util.*; import java.util.*;
import org.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.*;
public abstract class Author { public abstract class Author {
public abstract String getDisplayName(); public abstract String getDisplayName();

22
src/org/fbreader/description/BookDescription.java → src/org/geometerplus/fbreader/description/BookDescription.java
View file

@ -1,17 +1,17 @@
package org.fbreader.description; package org.geometerplus.fbreader.description;
import java.util.*; import java.util.*;
import org.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.*;
import org.fbreader.description.Author.MultiAuthor; import org.geometerplus.fbreader.description.Author.MultiAuthor;
import org.fbreader.description.Author.SingleAuthor; import org.geometerplus.fbreader.description.Author.SingleAuthor;
import org.fbreader.formats.FormatPlugin; import org.geometerplus.fbreader.formats.FormatPlugin;
import org.fbreader.formats.FormatPlugin.PluginCollection; import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection;
import org.fbreader.option.FBOptions; import org.geometerplus.fbreader.option.FBOptions;
import org.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.zlibrary.core.options.ZLBooleanOption; import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
import org.zlibrary.core.options.ZLIntegerRangeOption; import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;
import org.zlibrary.core.options.ZLStringOption; import org.geometerplus.zlibrary.core.options.ZLStringOption;
public class BookDescription { public class BookDescription {
private Author myAuthor; private Author myAuthor;

18
src/org/fbreader/description/BookDescriptionUtil.java → src/org/geometerplus/fbreader/description/BookDescriptionUtil.java
View file

@ -1,15 +1,15 @@
package org.fbreader.description; package org.geometerplus.fbreader.description;
import java.util.*; import java.util.*;
import org.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.util.*;
import org.fbreader.description.BookDescription.BookInfo; import org.geometerplus.fbreader.description.BookDescription.BookInfo;
import org.fbreader.formats.FormatPlugin.PluginCollection; import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection;
import org.fbreader.option.FBOptions; import org.geometerplus.fbreader.option.FBOptions;
import org.zlibrary.core.filesystem.ZLDir; import org.geometerplus.zlibrary.core.filesystem.ZLDir;
import org.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.zlibrary.core.options.ZLIntegerOption; import org.geometerplus.zlibrary.core.options.ZLIntegerOption;
import org.zlibrary.core.options.ZLStringOption; import org.geometerplus.zlibrary.core.options.ZLStringOption;
public class BookDescriptionUtil { public class BookDescriptionUtil {
private static final String SIZE = "Size"; private static final String SIZE = "Size";

10
src/org/fbreader/encoding/ZLEncodingCollection.java → src/org/geometerplus/fbreader/encoding/ZLEncodingCollection.java
View file

@ -1,13 +1,13 @@
package org.fbreader.encoding; package org.geometerplus.fbreader.encoding;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.zlibrary.core.config.ZLConfigManager; import org.geometerplus.zlibrary.core.config.ZLConfigManager;
import org.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.library.ZLibrary;
import org.zlibrary.core.options.ZLBooleanOption; import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
import org.zlibrary.core.options.ZLOption; import org.geometerplus.zlibrary.core.options.ZLOption;
public class ZLEncodingCollection { public class ZLEncodingCollection {
private static ZLEncodingCollection ourInstance; private static ZLEncodingCollection ourInstance;

2
src/org/fbreader/encoding/ZLEncodingConverter.java → src/org/geometerplus/fbreader/encoding/ZLEncodingConverter.java
View file

@ -1,4 +1,4 @@
package org.fbreader.encoding; package org.geometerplus.fbreader.encoding;
public abstract class ZLEncodingConverter { public abstract class ZLEncodingConverter {
protected ZLEncodingConverter() {} protected ZLEncodingConverter() {}

2
src/org/fbreader/encoding/ZLEncodingConverterInfo.java → src/org/geometerplus/fbreader/encoding/ZLEncodingConverterInfo.java
View file

@ -1,4 +1,4 @@
package org.fbreader.encoding; package org.geometerplus.fbreader.encoding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;

Some files were not shown because too many files have changed in this diff Show more