diff --git a/build.xml b/build.xml index e75ecd15a..5ca8d7b5a 100644 --- a/build.xml +++ b/build.xml @@ -16,13 +16,13 @@ - + - + @@ -69,7 +69,7 @@ - + diff --git a/data/application.xml b/data/application.xml index 5622ade28..cf5054af9 100644 --- a/data/application.xml +++ b/data/application.xml @@ -1,5 +1,5 @@ - + diff --git a/manifest.mf b/manifest.mf index ed782b0f7..b2571f091 100644 --- a/manifest.mf +++ b/manifest.mf @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Main-Class: org.zlibrary.ui.swing.library.Main +Main-Class: org.geometerplus.zlibrary.ui.swing.library.Main diff --git a/platform/android/AndroidManifest.xml b/platform/android/AndroidManifest.xml index f483c0e51..50b47f010 100644 --- a/platform/android/AndroidManifest.xml +++ b/platform/android/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/platform/android/build.xml b/platform/android/build.xml index bdf1ef51f..6766a13ab 100644 --- a/platform/android/build.xml +++ b/platform/android/build.xml @@ -71,14 +71,14 @@ - + - + diff --git a/platform/android/res/layout/main.xml b/platform/android/res/layout/main.xml index 963f63a55..772162b77 100644 --- a/platform/android/res/layout/main.xml +++ b/platform/android/res/layout/main.xml @@ -1,5 +1,5 @@ - myMenuItemMap = diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/AndroidDialog.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/AndroidDialog.java similarity index 89% rename from platform/android/src/org/zlibrary/ui/android/dialogs/AndroidDialog.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/AndroidDialog.java index fda45687d..dcd99c28b 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/AndroidDialog.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/AndroidDialog.java @@ -1,11 +1,11 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.app.Dialog; import android.os.Handler; import android.content.Context; import android.view.*; -import org.zlibrary.ui.android.library.ZLAndroidLibrary; +import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary; final class AndroidDialog extends Dialog { private final View myView; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ItemView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ItemView.java similarity index 88% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ItemView.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ItemView.java index 0bf38e6e4..658a49c0c 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ItemView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ItemView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import java.util.HashMap; @@ -6,9 +6,9 @@ import android.content.Context; import android.graphics.drawable.Drawable; 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 { static private final HashMap ourIconMap = new HashMap(); diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java similarity index 90% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java index 7a067c820..1b928b643 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java @@ -1,9 +1,9 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.view.*; import android.widget.*; -import org.zlibrary.core.dialogs.ZLBooleanOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLBooleanOptionEntry; class ZLAndroidBooleanOptionView extends ZLAndroidOptionView { CheckBox myCheckBox; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java similarity index 91% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java index debeb9a86..b5fc7bd19 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java @@ -1,10 +1,10 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.content.Context; import android.view.View; import android.widget.*; -import org.zlibrary.core.dialogs.ZLChoiceOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLChoiceOptionEntry; class ZLAndroidChoiceOptionView extends ZLAndroidOptionView { RadioGroup myGroup; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java similarity index 96% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java index a2793a1d2..82b51b589 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java @@ -1,12 +1,12 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.content.Context; import android.view.*; import android.widget.*; -import org.zlibrary.core.util.ZLColor; -import org.zlibrary.core.dialogs.ZLColorOptionEntry; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.dialogs.ZLColorOptionEntry; +import org.geometerplus.zlibrary.core.resources.ZLResource; class ZLAndroidColorOptionView extends ZLAndroidOptionView { private View myContainer; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java similarity index 95% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java index 8e9be75ad..58b3031d5 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java @@ -1,11 +1,11 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.content.Context; import android.view.*; import android.widget.*; import android.database.DataSetObserver; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; class ZLAndroidComboOptionView extends ZLAndroidOptionView { private Spinner mySpinner; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialog.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialog.java similarity index 86% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialog.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialog.java index 2f4c253b4..890e6687e 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialog.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialog.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.app.Dialog; import android.os.Handler; @@ -6,10 +6,10 @@ import android.content.Context; import android.view.*; import android.widget.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.dialogs.*; +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 { private final AndroidDialog myDialog; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java similarity index 95% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java index 054d41dc6..b4805cde3 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import java.util.ArrayList; @@ -6,9 +6,9 @@ import android.content.Context; import android.view.*; import android.widget.*; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; class ZLAndroidDialogContent extends ZLDialogContent { private final ListView myListView; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java similarity index 86% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java index c511c930b..3a04d754e 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java @@ -1,16 +1,16 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.app.*; import android.view.View; import android.content.*; import android.os.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.ui.android.application.ZLAndroidApplicationWindow; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.resources.ZLResource; +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 { private final Activity myActivity; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java similarity index 77% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java index 3ca5a3ac9..a8ca0984b 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java @@ -1,9 +1,9 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.view.View; -import org.zlibrary.core.dialogs.ZLOptionView; -import org.zlibrary.core.dialogs.ZLOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionView; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; abstract class ZLAndroidOptionView extends ZLOptionView { ZLAndroidDialogContent myTab; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java similarity index 96% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java index 405c54012..d56e736ca 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import java.util.ArrayList; @@ -6,8 +6,8 @@ import android.content.Context; import android.view.*; import android.widget.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; class ZLAndroidOptionsDialog extends ZLOptionsDialog { private final AndroidDialog myDialog; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidSelectionDialog.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSelectionDialog.java similarity index 93% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidSelectionDialog.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSelectionDialog.java index 1c999dce2..ba0b73a77 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidSelectionDialog.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSelectionDialog.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.content.Context; import android.app.Dialog; @@ -6,9 +6,9 @@ import android.os.*; import android.view.*; import android.widget.*; -import org.zlibrary.core.dialogs.ZLSelectionDialog; -import org.zlibrary.core.dialogs.ZLTreeHandler; -import org.zlibrary.core.dialogs.ZLTreeNode; +import org.geometerplus.zlibrary.core.dialogs.ZLSelectionDialog; +import org.geometerplus.zlibrary.core.dialogs.ZLTreeHandler; +import org.geometerplus.zlibrary.core.dialogs.ZLTreeNode; class ZLAndroidSelectionDialog extends ZLSelectionDialog { private boolean myReturnValue = false; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java similarity index 96% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java index c4b4f627d..648b5671a 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java @@ -1,10 +1,10 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.content.Context; import android.view.*; import android.widget.*; -import org.zlibrary.core.dialogs.ZLSpinOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLSpinOptionEntry; class ZLAndroidSpinOptionView extends ZLAndroidOptionView { private TextView myLabel; diff --git a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java similarity index 91% rename from platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java index ef4ddbb6b..3caf4fd24 100644 --- a/platform/android/src/org/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java @@ -1,10 +1,10 @@ -package org.zlibrary.ui.android.dialogs; +package org.geometerplus.zlibrary.ui.android.dialogs; import android.content.Context; import android.view.*; import android.widget.*; -import org.zlibrary.core.dialogs.ZLStringOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLStringOptionEntry; class ZLAndroidStringOptionView extends ZLAndroidOptionView { private TextView myLabel; diff --git a/platform/android/src/org/zlibrary/ui/android/image/ZLAndroidImageData.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java similarity index 68% rename from platform/android/src/org/zlibrary/ui/android/image/ZLAndroidImageData.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java index 683070419..bd9d608fc 100644 --- a/platform/android/src/org/zlibrary/ui/android/image/ZLAndroidImageData.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java @@ -1,8 +1,8 @@ -package org.zlibrary.ui.android.image; +package org.geometerplus.zlibrary.ui.android.image; import android.graphics.Bitmap; -import org.zlibrary.core.image.ZLImageData; +import org.geometerplus.zlibrary.core.image.ZLImageData; public final class ZLAndroidImageData implements ZLImageData { private Bitmap myBitmap; diff --git a/platform/android/src/org/zlibrary/ui/android/image/ZLAndroidImageManager.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java similarity index 63% rename from platform/android/src/org/zlibrary/ui/android/image/ZLAndroidImageManager.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java index 39ffcd8fd..4662798af 100644 --- a/platform/android/src/org/zlibrary/ui/android/image/ZLAndroidImageManager.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java @@ -1,9 +1,9 @@ -package org.zlibrary.ui.android.image; +package org.geometerplus.zlibrary.ui.android.image; import android.graphics.BitmapFactory; -import org.zlibrary.core.image.ZLImage; -import org.zlibrary.core.image.ZLImageManager; +import org.geometerplus.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.core.image.ZLImageManager; public final class ZLAndroidImageManager extends ZLImageManager { public ZLAndroidImageData getImageData(ZLImage image) { diff --git a/platform/android/src/org/zlibrary/ui/android/library/ZLAndroidActivity.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java similarity index 82% rename from platform/android/src/org/zlibrary/ui/android/library/ZLAndroidActivity.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java index 17dc04faa..922fa7f36 100644 --- a/platform/android/src/org/zlibrary/ui/android/library/ZLAndroidActivity.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java @@ -1,18 +1,15 @@ -package org.zlibrary.ui.android.library; +package org.geometerplus.zlibrary.ui.android.library; import android.app.Activity; import android.os.Bundle; 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 static long StartTime; - public void onCreate(Bundle icicle) { - StartTime = System.currentTimeMillis(); super.onCreate(icicle); //requestWindowFeature(Window.FEATURE_NO_TITLE); //getWindow().setFlags(WindowManager.LayoutParams.NO_STATUS_BAR_FLAG, WindowManager.LayoutParams.NO_STATUS_BAR_FLAG); diff --git a/platform/android/src/org/zlibrary/ui/android/library/ZLAndroidLibrary.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java similarity index 73% rename from platform/android/src/org/zlibrary/ui/android/library/ZLAndroidLibrary.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index fdc3693b9..23b60f734 100644 --- a/platform/android/src/org/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.android.library; +package org.geometerplus.zlibrary.ui.android.library; import java.io.*; @@ -6,18 +6,18 @@ import android.content.Resources; import android.content.Intent; import android.net.Uri; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.application.ZLApplication; -//import org.zlibrary.core.xml.sax.ZLSaxXMLProcessorFactory; -import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; -import org.zlibrary.core.sqliteconfig.ZLSQLiteConfigManager; +//import org.geometerplus.zlibrary.core.xml.sax.ZLSaxXMLProcessorFactory; +import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; +import org.geometerplus.zlibrary.core.sqliteconfig.ZLSQLiteConfigManager; -import org.zlibrary.ui.android.view.ZLAndroidPaintContext; -import org.zlibrary.ui.android.view.ZLAndroidWidget; -import org.zlibrary.ui.android.application.ZLAndroidApplicationWindow; -import org.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; -import org.zlibrary.ui.android.image.ZLAndroidImageManager; +import org.geometerplus.zlibrary.ui.android.view.ZLAndroidPaintContext; +import org.geometerplus.zlibrary.ui.android.view.ZLAndroidWidget; +import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow; +import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; +import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager; public final class ZLAndroidLibrary extends ZLibrary { private ZLAndroidActivity myActivity; diff --git a/platform/android/src/org/zlibrary/ui/android/util/ZLAndroidKeyUtil.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java similarity index 98% rename from platform/android/src/org/zlibrary/ui/android/util/ZLAndroidKeyUtil.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java index 566bca73f..16748b904 100644 --- a/platform/android/src/org/zlibrary/ui/android/util/ZLAndroidKeyUtil.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.android.util; +package org.geometerplus.zlibrary.ui.android.util; import android.view.KeyEvent; diff --git a/platform/android/src/org/zlibrary/ui/android/view/ZLAndroidPaintContext.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java similarity index 93% rename from platform/android/src/org/zlibrary/ui/android/view/ZLAndroidPaintContext.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java index b4bfb4a36..8f6fa7c25 100644 --- a/platform/android/src/org/zlibrary/ui/android/view/ZLAndroidPaintContext.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java @@ -1,16 +1,16 @@ -package org.zlibrary.ui.android.view; +package org.geometerplus.zlibrary.ui.android.view; import java.util.ArrayList; import java.util.HashMap; import android.graphics.*; -import org.zlibrary.core.image.ZLImageData; -import org.zlibrary.core.util.ZLColor; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.core.image.ZLImageData; +import org.geometerplus.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +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 { private Canvas myCanvas; diff --git a/platform/android/src/org/zlibrary/ui/android/view/ZLAndroidViewWidget.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java similarity index 68% rename from platform/android/src/org/zlibrary/ui/android/view/ZLAndroidViewWidget.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java index 24b4c3071..583f160a9 100644 --- a/platform/android/src/org/zlibrary/ui/android/view/ZLAndroidViewWidget.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java @@ -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.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.core.view.ZLView; +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 { private final ZLAndroidWidget myWidget = diff --git a/platform/android/src/org/zlibrary/ui/android/view/ZLAndroidWidget.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java similarity index 83% rename from platform/android/src/org/zlibrary/ui/android/view/ZLAndroidWidget.java rename to platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java index a81e099f9..4362bbab0 100644 --- a/platform/android/src/org/zlibrary/ui/android/view/ZLAndroidWidget.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.android.view; +package org.geometerplus.zlibrary.ui.android.view; import java.util.Map; @@ -7,10 +7,10 @@ import android.graphics.Canvas; import android.view.*; import android.util.AttributeSet; -import org.zlibrary.core.view.ZLView; -import org.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.core.view.ZLView; +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 { private final ZLAndroidPaintContext myPaintContext = new ZLAndroidPaintContext(); @@ -34,8 +34,6 @@ public class ZLAndroidWidget extends View { myViewWidget = viewWidget; } - private long myTime; - public void onDraw(Canvas canvas) { super.onDraw(canvas); if (myViewWidget == null) { @@ -71,14 +69,6 @@ public class ZLAndroidWidget extends View { break; } 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(); } diff --git a/platform/j2me/FBReaderJ.jad b/platform/j2me/FBReaderJ.jad index b522f3ac1..32f80dc70 100644 --- a/platform/j2me/FBReaderJ.jad +++ b/platform/j2me/FBReaderJ.jad @@ -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-Jar-URL: FBReaderJ.jar MIDlet-Name: FBReaderJ diff --git a/platform/j2me/build.xml b/platform/j2me/build.xml index cc1e0a50f..d6a8b1904 100644 --- a/platform/j2me/build.xml +++ b/platform/j2me/build.xml @@ -33,7 +33,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/platform/j2me/manifest.mf b/platform/j2me/manifest.mf index 5d2ca5a38..85c02ee35 100644 --- a/platform/j2me/manifest.mf +++ b/platform/j2me/manifest.mf @@ -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-Name: FBReaderJ MIDlet-Vendor: Geometer Plus diff --git a/platform/j2me/src/java/util/zip/ZipFile.java b/platform/j2me/src/java/util/zip/ZipFile.java index 61d63a160..69dc30fb8 100644 --- a/platform/j2me/src/java/util/zip/ZipFile.java +++ b/platform/j2me/src/java/util/zip/ZipFile.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Enumeration; -import org.zlibrary.core.util.File; +import org.geometerplus.zlibrary.core.util.File; public class ZipFile { public ZipFile(String name) throws IOException { diff --git a/platform/j2me/src/org/zlibrary/core/util/ArrayList.java b/platform/j2me/src/org/zlibrary/core/util/ArrayList.java index 9bcfa2534..6317c0b47 100644 --- a/platform/j2me/src/org/zlibrary/core/util/ArrayList.java +++ b/platform/j2me/src/org/zlibrary/core/util/ArrayList.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; import java.util.Vector; diff --git a/platform/j2me/src/org/zlibrary/core/util/Collections.java b/platform/j2me/src/org/zlibrary/core/util/Collections.java index 2f115c38f..66122a534 100644 --- a/platform/j2me/src/org/zlibrary/core/util/Collections.java +++ b/platform/j2me/src/org/zlibrary/core/util/Collections.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public abstract class Collections { public static void sort(ArrayList list, Comparator comparator) { diff --git a/platform/j2me/src/org/zlibrary/core/util/Comparator.java b/platform/j2me/src/org/zlibrary/core/util/Comparator.java index ce3b2fe40..7ef50c2dd 100644 --- a/platform/j2me/src/org/zlibrary/core/util/Comparator.java +++ b/platform/j2me/src/org/zlibrary/core/util/Comparator.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public interface Comparator { int compare(Object object0, Object object1); diff --git a/platform/j2me/src/org/zlibrary/core/util/File.java b/platform/j2me/src/org/zlibrary/core/util/File.java index 96d2df2b2..45f83ff66 100644 --- a/platform/j2me/src/org/zlibrary/core/util/File.java +++ b/platform/j2me/src/org/zlibrary/core/util/File.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; import java.io.IOException; diff --git a/platform/j2me/src/org/zlibrary/core/util/HashMap.java b/platform/j2me/src/org/zlibrary/core/util/HashMap.java index 911139e24..760dd3d39 100644 --- a/platform/j2me/src/org/zlibrary/core/util/HashMap.java +++ b/platform/j2me/src/org/zlibrary/core/util/HashMap.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; import java.util.Hashtable; diff --git a/platform/j2me/src/org/zlibrary/core/util/Locale.java b/platform/j2me/src/org/zlibrary/core/util/Locale.java index 29826c83d..1ce9639a1 100644 --- a/platform/j2me/src/org/zlibrary/core/util/Locale.java +++ b/platform/j2me/src/org/zlibrary/core/util/Locale.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public final class Locale { static private Locale ourDefaultLocale; diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/application/ZLJ2MEApplicationWindow.java b/platform/j2me/src/org/zlibrary/ui/j2me/application/ZLJ2MEApplicationWindow.java index 3e13a160e..49cdbb18f 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/application/ZLJ2MEApplicationWindow.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/application/ZLJ2MEApplicationWindow.java @@ -1,9 +1,9 @@ -package org.zlibrary.ui.j2me.application; +package org.geometerplus.zlibrary.ui.j2me.application; -import org.zlibrary.core.application.*; -import org.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.core.application.*; +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 { private final ZLCanvas myCanvas; diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfig.java b/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfig.java index 68defd590..7a64585fd 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfig.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfig.java @@ -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 { public void removeGroup(String name) { diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfigManager.java b/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfigManager.java index 85c1ec427..e50cead8a 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfigManager.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfigManager.java @@ -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.zlibrary.core.config.ZLConfigManager; +import org.geometerplus.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.config.ZLConfigManager; public class ZLJ2MEConfigManager extends ZLConfigManager { public ZLJ2MEConfigManager() { diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageData.java b/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageData.java index 1e5fd774e..f68533658 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageData.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageData.java @@ -1,8 +1,8 @@ -package org.zlibrary.ui.j2me.image; +package org.geometerplus.zlibrary.ui.j2me.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 { private Image myImage; diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageManager.java b/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageManager.java index 14cb50a88..e0f8ff081 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageManager.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageManager.java @@ -1,8 +1,8 @@ -package org.zlibrary.ui.j2me.image; +package org.geometerplus.zlibrary.ui.j2me.image; import javax.microedition.lcdui.Image; -import org.zlibrary.core.image.*; +import org.geometerplus.zlibrary.core.image.*; public final class ZLJ2MEImageManager extends ZLImageManager { public ZLImageData getImageData(ZLImage image) { diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java b/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java index 8b82b1b3a..c7d0145a8 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.j2me.library; +package org.geometerplus.zlibrary.ui.j2me.library; import java.io.InputStream; import javax.microedition.io.Connector; @@ -7,16 +7,16 @@ import javax.microedition.io.file.*; import javax.microedition.midlet.MIDlet; import javax.microedition.lcdui.Display; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +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.zlibrary.ui.j2me.view.ZLCanvas; -import org.zlibrary.ui.j2me.application.ZLJ2MEApplicationWindow; -import org.zlibrary.ui.j2me.image.ZLJ2MEImageManager; +import org.geometerplus.zlibrary.ui.j2me.config.ZLJ2MEConfigManager; +import org.geometerplus.zlibrary.ui.j2me.view.ZLCanvas; +import org.geometerplus.zlibrary.ui.j2me.application.ZLJ2MEApplicationWindow; +import org.geometerplus.zlibrary.ui.j2me.image.ZLJ2MEImageManager; final class ZLJ2MELibrary extends ZLibrary { private ZLCanvas myCanvas; diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLMIDlet.java b/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLMIDlet.java index 3657b9da1..f3a4d9c4d 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLMIDlet.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLMIDlet.java @@ -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.lcdui.*; diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLCanvas.java b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLCanvas.java index bef3b784c..f167b5f75 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLCanvas.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLCanvas.java @@ -1,9 +1,9 @@ -package org.zlibrary.ui.j2me.view; +package org.geometerplus.zlibrary.ui.j2me.view; import javax.microedition.lcdui.*; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; public class ZLCanvas extends Canvas { private final ZLJ2MEPaintContext myContext = new ZLJ2MEPaintContext(this); diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEPaintContext.java b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEPaintContext.java index 6ff9d5073..72b3c43cf 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEPaintContext.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEPaintContext.java @@ -1,12 +1,12 @@ -package org.zlibrary.ui.j2me.view; +package org.geometerplus.zlibrary.ui.j2me.view; import javax.microedition.lcdui.*; -import org.zlibrary.core.util.ZLColor; -import org.zlibrary.core.image.ZLImageData; -import org.zlibrary.ui.j2me.image.ZLJ2MEImageData; +import org.geometerplus.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.image.ZLImageData; +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 { private final Canvas myCanvas; diff --git a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEViewWidget.java b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEViewWidget.java index a70ddf56c..322888442 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEViewWidget.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEViewWidget.java @@ -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 { private final ZLCanvas myCanvas; diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigImpl.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigImpl.java similarity index 93% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigImpl.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigImpl.java index cb644004a..e37738f02 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigImpl.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigImpl.java @@ -1,8 +1,8 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; import java.util.*; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.config.ZLConfig; final class ZLConfigImpl implements ZLConfig { diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigReader.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigReader.java similarity index 94% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigReader.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigReader.java index 2a85de1c3..e187616ec 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigReader.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigReader.java @@ -1,9 +1,9 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; import java.io.*; import java.util.Map; -import org.zlibrary.core.xml.*; +import org.geometerplus.zlibrary.core.xml.*; final class ZLConfigReader implements ZLReader { private class ConfigReader extends ZLXMLReaderAdapter { diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigWriter.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigWriter.java similarity index 95% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigWriter.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigWriter.java index 1e233f386..521722c92 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLConfigWriter.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigWriter.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; import java.io.*; import java.util.*; diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java similarity index 89% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java index 7725c7b19..110ea3742 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; import java.util.*; diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeltaConfig.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeltaConfig.java similarity index 95% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeltaConfig.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeltaConfig.java index 5de789f13..c08e9320b 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLDeltaConfig.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeltaConfig.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; import java.util.*; diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLGroup.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLGroup.java similarity index 89% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLGroup.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLGroup.java index 822c7054a..50ba9df99 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLGroup.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLGroup.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; import java.util.Set; import java.util.HashMap; diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionID.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionID.java similarity index 87% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionID.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionID.java index 9b3d2b06b..2a978a6da 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionID.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionID.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; final class ZLOptionID { private String myGroup = ""; diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionInfo.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionInfo.java similarity index 90% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionInfo.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionInfo.java index 36c6ff20d..650ba8831 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLOptionInfo.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionInfo.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; final class ZLOptionInfo { private String myValue; diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLReader.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLReader.java new file mode 100644 index 000000000..8c085ed4e --- /dev/null +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLReader.java @@ -0,0 +1,5 @@ +package org.geometerplus.zlibrary.core.xmlconfig; + +public interface ZLReader { + public void read(); +} diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLSimpleConfig.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLSimpleConfig.java similarity index 93% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLSimpleConfig.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLSimpleConfig.java index 54c8714f0..6c74f2ed5 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLSimpleConfig.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLSimpleConfig.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; import java.util.Set; import java.util.HashMap; diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLWriter.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLWriter.java similarity index 66% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLWriter.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLWriter.java index b88ff1c84..8a7a169f5 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLWriter.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLWriter.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xmlconfig; +package org.geometerplus.zlibrary.core.xmlconfig; public interface ZLWriter { public void write(); diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLXMLConfigManager.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLXMLConfigManager.java similarity index 89% rename from platform/swing/src/org/zlibrary/core/xmlconfig/ZLXMLConfigManager.java rename to platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLXMLConfigManager.java index e3d0eb9e0..4d72b347b 100644 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLXMLConfigManager.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLXMLConfigManager.java @@ -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 { private String myDirectoryPath; diff --git a/platform/swing/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java similarity index 94% rename from platform/swing/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java index 2a72ecfbd..7fefd9571 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.application; +package org.geometerplus.zlibrary.ui.swing.application; import java.util.HashMap; import java.util.Stack; @@ -7,13 +7,13 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.application.ZLApplicationWindow; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; -import org.zlibrary.ui.swing.view.ZLSwingViewWidget; -import org.zlibrary.ui.swing.util.ZLSwingIconUtil; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.application.ZLApplicationWindow; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.zlibrary.ui.swing.view.ZLSwingViewWidget; +import org.geometerplus.zlibrary.ui.swing.util.ZLSwingIconUtil; @SuppressWarnings("serial") public class ZLSwingApplicationWindow extends ZLApplicationWindow { diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java similarity index 95% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java index 28cd55f68..9705dea3e 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.Component; import java.awt.Graphics; @@ -24,8 +24,8 @@ import javax.swing.plaf.ActionMapUIResource; import javax.swing.plaf.UIResource; import javax.swing.plaf.metal.MetalLookAndFeel; -import org.zlibrary.core.dialogs.ZLBoolean3OptionEntry; -import org.zlibrary.core.util.ZLBoolean3; +import org.geometerplus.zlibrary.core.dialogs.ZLBoolean3OptionEntry; +import org.geometerplus.zlibrary.core.util.ZLBoolean3; public class ZLBoolean3OptionView extends ZLSwingOptionView { private TristateCheckBox myTristateCheckBox; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java similarity index 87% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java index 799e5f5f0..32b3f56ed 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -8,7 +8,7 @@ import javax.swing.JCheckBox; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import org.zlibrary.core.dialogs.ZLBooleanOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLBooleanOptionEntry; public class ZLBooleanOptionView extends ZLSwingOptionView { private JCheckBox myCheckBox; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java similarity index 90% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java index 6c391cd6d..fc426babb 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -11,7 +11,7 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.border.TitledBorder; -import org.zlibrary.core.dialogs.ZLChoiceOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLChoiceOptionEntry; public class ZLChoiceOptionView extends ZLSwingOptionView { private final ButtonGroup myButtonGroup = new ButtonGroup(); diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLColorOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLColorOptionView.java similarity index 94% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLColorOptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLColorOptionView.java index ad5480aaa..19f6054a1 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLColorOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLColorOptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.*; import java.awt.event.ActionEvent; @@ -7,9 +7,9 @@ import java.util.LinkedHashMap; import javax.swing.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.util.ZLColor; public class ZLColorOptionView extends ZLSwingOptionView { private JComboBox myStandardColorComboBox; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLComboOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLComboOptionView.java similarity index 92% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLComboOptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLComboOptionView.java index ad0b1c38f..9d91cd75a 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLComboOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLComboOptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.util.ArrayList; @@ -6,7 +6,7 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; public class ZLComboOptionView extends ZLSwingOptionView { private JComboBox myComboBox; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java similarity index 93% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java index 98cb1fc4d..e7c5bf2b1 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.BorderLayout; import java.awt.Dimension; @@ -20,8 +20,8 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Document; import javax.swing.text.PlainDocument; -import org.zlibrary.core.dialogs.ZLKeyOptionEntry; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.dialogs.ZLKeyOptionEntry; +import org.geometerplus.zlibrary.core.resources.ZLResource; public class ZLKeyOptionView extends ZLSwingOptionView { private JComboBox myComboBox; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java similarity index 90% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java index 7a2779689..27e8e81e7 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.BorderLayout; import java.awt.Dimension; @@ -11,7 +11,7 @@ import javax.swing.JPanel; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; -import org.zlibrary.core.dialogs.ZLSpinOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLSpinOptionEntry; public class ZLSpinOptionView extends ZLSwingOptionView { private JSpinner mySpinner; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLStringOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLStringOptionView.java similarity index 89% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLStringOptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLStringOptionView.java index 48b019557..7383bcd03 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLStringOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLStringOptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.BorderLayout; import java.awt.Dimension; @@ -13,8 +13,8 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; -import org.zlibrary.core.dialogs.ZLStringOptionEntry; -import org.zlibrary.core.dialogs.ZLTextOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLStringOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLTextOptionEntry; public class ZLStringOptionView extends ZLSwingOptionView { private JLabel myLabel; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialog.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialog.java similarity index 87% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialog.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialog.java index 185fe18fd..58f15886d 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialog.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialog.java @@ -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.zlibrary.core.dialogs.ZLDialogManager; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.dialogs.ZLDialog; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.options.ZLOption; import java.awt.BorderLayout; import java.awt.event.ActionEvent; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java similarity index 91% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java index 4c1a832b6..3456e840f 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -8,8 +8,8 @@ import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; public class ZLSwingDialogContent extends ZLDialogContent { private final JPanel myContentPanel = new JPanel(); diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java similarity index 91% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java index dd33be86c..0f8b70ab4 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.BorderLayout; import java.awt.Color; @@ -7,9 +7,9 @@ import java.awt.event.WindowEvent; import javax.swing.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.ui.swing.application.ZLSwingApplicationWindow; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.ui.swing.application.ZLSwingApplicationWindow; public class ZLSwingDialogManager extends ZLDialogManager { private ZLSwingApplicationWindow myApplicationWindow; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java similarity index 83% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java index 87a9895fc..0c25318bb 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java @@ -1,12 +1,12 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import javax.swing.JComponent; -import org.zlibrary.core.dialogs.ZLOptionEntry; -import org.zlibrary.core.dialogs.ZLOptionView; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionView; public abstract class ZLSwingOptionView extends ZLOptionView { protected final ZLSwingDialogContent myTab; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java similarity index 93% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java index 69637dbb8..b64fe2310 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.util.*; import java.awt.*; @@ -7,9 +7,9 @@ import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; -import org.zlibrary.core.options.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; public class ZLSwingOptionsDialog extends ZLOptionsDialog { private final boolean myShowApplyButton; diff --git a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java similarity index 93% rename from platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java index b1b55be9e..7dc13e021 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.dialogs; +package org.geometerplus.zlibrary.ui.swing.dialogs; import java.util.HashMap; import java.awt.*; @@ -7,12 +7,12 @@ import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; -import org.zlibrary.core.dialogs.ZLSelectionDialog; -import org.zlibrary.core.dialogs.ZLTreeHandler; -import org.zlibrary.core.dialogs.ZLTreeNode; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.ui.swing.util.ZLSwingIconUtil; +import org.geometerplus.zlibrary.core.dialogs.ZLSelectionDialog; +import org.geometerplus.zlibrary.core.dialogs.ZLTreeHandler; +import org.geometerplus.zlibrary.core.dialogs.ZLTreeNode; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.ui.swing.util.ZLSwingIconUtil; class ZLSwingSelectionDialog extends ZLSelectionDialog { private static final String OPTION_GROUP_NAME = "OpenFileDialog"; diff --git a/platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageData.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageData.java similarity index 71% rename from platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageData.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageData.java index 6fd0e7a24..c34292d0b 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageData.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageData.java @@ -1,8 +1,8 @@ -package org.zlibrary.ui.swing.image; +package org.geometerplus.zlibrary.ui.swing.image; import java.awt.image.BufferedImage; -import org.zlibrary.core.image.ZLImageData; +import org.geometerplus.zlibrary.core.image.ZLImageData; public final class ZLSwingImageData implements ZLImageData { private final BufferedImage myImage; diff --git a/platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageManager.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageManager.java similarity index 73% rename from platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageManager.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageManager.java index 9378bad77..a228f6bc5 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/image/ZLSwingImageManager.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageManager.java @@ -1,12 +1,12 @@ -package org.zlibrary.ui.swing.image; +package org.geometerplus.zlibrary.ui.swing.image; import java.awt.image.BufferedImage; import javax.imageio.ImageIO; import java.io.ByteArrayInputStream; import java.io.IOException; -import org.zlibrary.core.image.ZLImage; -import org.zlibrary.core.image.ZLImageManager; +import org.geometerplus.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.core.image.ZLImageManager; public final class ZLSwingImageManager extends ZLImageManager { public ZLSwingImageData getImageData(ZLImage image) { diff --git a/platform/swing/src/org/zlibrary/ui/swing/library/Main.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/Main.java similarity index 66% rename from platform/swing/src/org/zlibrary/ui/swing/library/Main.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/Main.java index f7fa0b23d..f54bdb50f 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/library/Main.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/Main.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.library; +package org.geometerplus.zlibrary.ui.swing.library; public class Main { public static void main(String[] args) { diff --git a/platform/swing/src/org/zlibrary/ui/swing/library/ZLSwingLibrary.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/ZLSwingLibrary.java similarity index 76% rename from platform/swing/src/org/zlibrary/ui/swing/library/ZLSwingLibrary.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/ZLSwingLibrary.java index 55b9477ab..8329c6a24 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/library/ZLSwingLibrary.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/ZLSwingLibrary.java @@ -1,20 +1,20 @@ -package org.zlibrary.ui.swing.library; +package org.geometerplus.zlibrary.ui.swing.library; import java.io.*; import javax.swing.UIManager; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.xmlconfig.ZLXMLConfigManager; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.dialogs.ZLDialogManager; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.xmlconfig.ZLXMLConfigManager; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; -import org.zlibrary.core.html.own.ZLOwnHtmlProcessorFactory; -import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; +import org.geometerplus.zlibrary.core.html.own.ZLOwnHtmlProcessorFactory; +import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; -import org.zlibrary.ui.swing.view.ZLSwingPaintContext; -import org.zlibrary.ui.swing.application.ZLSwingApplicationWindow; -import org.zlibrary.ui.swing.dialogs.ZLSwingDialogManager; -import org.zlibrary.ui.swing.image.ZLSwingImageManager; +import org.geometerplus.zlibrary.ui.swing.view.ZLSwingPaintContext; +import org.geometerplus.zlibrary.ui.swing.application.ZLSwingApplicationWindow; +import org.geometerplus.zlibrary.ui.swing.dialogs.ZLSwingDialogManager; +import org.geometerplus.zlibrary.ui.swing.image.ZLSwingImageManager; public class ZLSwingLibrary extends ZLibrary { public ZLSwingPaintContext createPaintContext() { diff --git a/platform/swing/src/org/zlibrary/ui/swing/util/ZLSwingIconUtil.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/util/ZLSwingIconUtil.java similarity index 86% rename from platform/swing/src/org/zlibrary/ui/swing/util/ZLSwingIconUtil.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/util/ZLSwingIconUtil.java index 18e04a354..5ed8c7372 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/util/ZLSwingIconUtil.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/util/ZLSwingIconUtil.java @@ -1,4 +1,4 @@ -package org.zlibrary.ui.swing.util; +package org.geometerplus.zlibrary.ui.swing.util; import java.net.URL; import javax.swing.ImageIcon; diff --git a/platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingPaintContext.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingPaintContext.java similarity index 92% rename from platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingPaintContext.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingPaintContext.java index 14c2d2171..87ffddf8c 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingPaintContext.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingPaintContext.java @@ -1,14 +1,14 @@ -package org.zlibrary.ui.swing.view; +package org.geometerplus.zlibrary.ui.swing.view; import java.util.*; import java.awt.*; import java.awt.image.BufferedImage; -import org.zlibrary.core.image.ZLImageData; -import org.zlibrary.core.util.ZLColor; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.core.view.ZLViewWidget; -import org.zlibrary.ui.swing.image.ZLSwingImageData; +import org.geometerplus.zlibrary.core.image.ZLImageData; +import org.geometerplus.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.ui.swing.image.ZLSwingImageData; public final class ZLSwingPaintContext extends ZLPaintContext { private Graphics2D myGraphics; diff --git a/platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingViewWidget.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingViewWidget.java similarity index 94% rename from platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingViewWidget.java rename to platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingViewWidget.java index f80a1b6ec..0191ec3e0 100644 --- a/platform/swing/src/org/zlibrary/ui/swing/view/ZLSwingViewWidget.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingViewWidget.java @@ -1,11 +1,11 @@ -package org.zlibrary.ui.swing.view; +package org.geometerplus.zlibrary.ui.swing.view; import java.awt.*; import java.awt.event.*; import javax.swing.JPanel; -import org.zlibrary.core.view.ZLViewWidget; -import org.zlibrary.core.view.ZLView; +import org.geometerplus.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.core.view.ZLView; public final class ZLSwingViewWidget extends ZLViewWidget implements MouseListener, MouseMotionListener { @SuppressWarnings("serial") diff --git a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLReader.java b/platform/swing/src/org/zlibrary/core/xmlconfig/ZLReader.java deleted file mode 100644 index 778ed516e..000000000 --- a/platform/swing/src/org/zlibrary/core/xmlconfig/ZLReader.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.zlibrary.core.xmlconfig; - -public interface ZLReader { - public void read(); -} diff --git a/src/org/fbreader/fbreader/FootnoteView.java b/src/org/fbreader/fbreader/FootnoteView.java deleted file mode 100644 index a398beb0c..000000000 --- a/src/org/fbreader/fbreader/FootnoteView.java +++ /dev/null @@ -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); - } -} diff --git a/src/org/fbreader/formats/EncodedTextReader.java b/src/org/fbreader/formats/EncodedTextReader.java deleted file mode 100644 index 42a95c1df..000000000 --- a/src/org/fbreader/formats/EncodedTextReader.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.fbreader.formats; - -public class EncodedTextReader { - -} diff --git a/src/org/fbreader/bookmodel/BookModel.java b/src/org/geometerplus/fbreader/bookmodel/BookModel.java similarity index 74% rename from src/org/fbreader/bookmodel/BookModel.java rename to src/org/geometerplus/fbreader/bookmodel/BookModel.java index cd9e627ab..3504b67f5 100644 --- a/src/org/fbreader/bookmodel/BookModel.java +++ b/src/org/geometerplus/fbreader/bookmodel/BookModel.java @@ -1,19 +1,19 @@ -package org.fbreader.bookmodel; +package org.geometerplus.fbreader.bookmodel; import java.util.*; -import org.zlibrary.core.util.*; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.image.ZLImage; -import org.zlibrary.core.image.ZLImageMap; +import org.geometerplus.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.core.image.ZLImageMap; -import org.zlibrary.text.model.ZLTextModel; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.impl.ZLModelFactory; -import org.zlibrary.text.model.impl.ZLTextPlainModelImpl; +import org.geometerplus.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.text.model.impl.ZLTextPlainModelImpl; -import org.fbreader.description.BookDescription; -import org.fbreader.formats.FormatPlugin; -import org.fbreader.formats.FormatPlugin.PluginCollection; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.formats.FormatPlugin; +import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection; public final class BookModel { private final ZLTextPlainModelImpl myBookTextModel = new ZLTextPlainModelImpl(65536); diff --git a/src/org/fbreader/bookmodel/BookReader.java b/src/org/geometerplus/fbreader/bookmodel/BookReader.java similarity index 91% rename from src/org/fbreader/bookmodel/BookReader.java rename to src/org/geometerplus/fbreader/bookmodel/BookReader.java index 271f77c06..820ed3c4f 100644 --- a/src/org/fbreader/bookmodel/BookReader.java +++ b/src/org/geometerplus/fbreader/bookmodel/BookReader.java @@ -1,14 +1,14 @@ -package org.fbreader.bookmodel; +package org.geometerplus.fbreader.bookmodel; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.image.ZLImage; -import org.zlibrary.core.util.ZLArrayUtils; -import org.zlibrary.core.util.ZLTextBuffer; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.ZLTextTreeParagraph; -import org.zlibrary.text.model.impl.ZLTextPlainModelImpl; +import org.geometerplus.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.util.ZLTextBuffer; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLTextPlainModelImpl; public class BookReader { private final BookModel myBookModel; diff --git a/src/org/fbreader/bookmodel/ContentsModel.java b/src/org/geometerplus/fbreader/bookmodel/ContentsModel.java similarity index 60% rename from src/org/fbreader/bookmodel/ContentsModel.java rename to src/org/geometerplus/fbreader/bookmodel/ContentsModel.java index 713405fa0..4f5e93c74 100644 --- a/src/org/fbreader/bookmodel/ContentsModel.java +++ b/src/org/geometerplus/fbreader/bookmodel/ContentsModel.java @@ -1,11 +1,11 @@ -package org.fbreader.bookmodel; +package org.geometerplus.fbreader.bookmodel; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.text.model.ZLTextTreeModel; -import org.zlibrary.text.model.ZLTextTreeParagraph; -import org.zlibrary.text.model.impl.ZLTextTreeModelImpl; +import org.geometerplus.zlibrary.text.model.ZLTextTreeModel; +import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLTextTreeModelImpl; public class ContentsModel extends ZLTextTreeModelImpl implements ZLTextTreeModel{ private final HashMap myReferenceByParagraph = new HashMap(); diff --git a/src/org/fbreader/bookmodel/FBTextKind.java b/src/org/geometerplus/fbreader/bookmodel/FBTextKind.java similarity index 94% rename from src/org/fbreader/bookmodel/FBTextKind.java rename to src/org/geometerplus/fbreader/bookmodel/FBTextKind.java index 4834d93e0..a7fa5f7b1 100644 --- a/src/org/fbreader/bookmodel/FBTextKind.java +++ b/src/org/geometerplus/fbreader/bookmodel/FBTextKind.java @@ -1,4 +1,4 @@ -package org.fbreader.bookmodel; +package org.geometerplus.fbreader.bookmodel; public interface FBTextKind { byte REGULAR = 0; diff --git a/src/org/fbreader/collection/BookCollection.java b/src/org/geometerplus/fbreader/collection/BookCollection.java similarity index 90% rename from src/org/fbreader/collection/BookCollection.java rename to src/org/geometerplus/fbreader/collection/BookCollection.java index 4be1022b6..b2b91234a 100644 --- a/src/org/fbreader/collection/BookCollection.java +++ b/src/org/geometerplus/fbreader/collection/BookCollection.java @@ -1,19 +1,19 @@ -package org.fbreader.collection; +package org.geometerplus.fbreader.collection; import java.io.*; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.fbreader.description.Author; -import org.fbreader.description.BookDescription; -import org.fbreader.description.BookDescriptionUtil; -import org.fbreader.formats.FormatPlugin.PluginCollection; -import org.zlibrary.core.filesystem.ZLDir; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.core.options.ZLStringOption; +import org.geometerplus.fbreader.description.Author; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.description.BookDescriptionUtil; +import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection; +import org.geometerplus.zlibrary.core.filesystem.ZLDir; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.options.ZLStringOption; public class BookCollection { public final ZLStringOption PathOption; diff --git a/src/org/fbreader/collection/BookList.java b/src/org/geometerplus/fbreader/collection/BookList.java similarity index 80% rename from src/org/fbreader/collection/BookList.java rename to src/org/geometerplus/fbreader/collection/BookList.java index e366f7964..95340d69e 100644 --- a/src/org/fbreader/collection/BookList.java +++ b/src/org/geometerplus/fbreader/collection/BookList.java @@ -1,11 +1,11 @@ -package org.fbreader.collection; +package org.geometerplus.fbreader.collection; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.options.ZLStringOption; public class BookList { private final static String GROUP = "BookList"; diff --git a/src/org/fbreader/description/Author.java b/src/org/geometerplus/fbreader/description/Author.java similarity index 92% rename from src/org/fbreader/description/Author.java rename to src/org/geometerplus/fbreader/description/Author.java index 4f3d270be..dbb266295 100644 --- a/src/org/fbreader/description/Author.java +++ b/src/org/geometerplus/fbreader/description/Author.java @@ -1,7 +1,7 @@ -package org.fbreader.description; +package org.geometerplus.fbreader.description; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public abstract class Author { public abstract String getDisplayName(); diff --git a/src/org/fbreader/description/BookDescription.java b/src/org/geometerplus/fbreader/description/BookDescription.java similarity index 89% rename from src/org/fbreader/description/BookDescription.java rename to src/org/geometerplus/fbreader/description/BookDescription.java index 7fa245711..84e33b17f 100644 --- a/src/org/fbreader/description/BookDescription.java +++ b/src/org/geometerplus/fbreader/description/BookDescription.java @@ -1,17 +1,17 @@ -package org.fbreader.description; +package org.geometerplus.fbreader.description; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.fbreader.description.Author.MultiAuthor; -import org.fbreader.description.Author.SingleAuthor; -import org.fbreader.formats.FormatPlugin; -import org.fbreader.formats.FormatPlugin.PluginCollection; -import org.fbreader.option.FBOptions; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.options.ZLStringOption; +import org.geometerplus.fbreader.description.Author.MultiAuthor; +import org.geometerplus.fbreader.description.Author.SingleAuthor; +import org.geometerplus.fbreader.formats.FormatPlugin; +import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection; +import org.geometerplus.fbreader.option.FBOptions; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.options.ZLStringOption; public class BookDescription { private Author myAuthor; diff --git a/src/org/fbreader/description/BookDescriptionUtil.java b/src/org/geometerplus/fbreader/description/BookDescriptionUtil.java similarity index 77% rename from src/org/fbreader/description/BookDescriptionUtil.java rename to src/org/geometerplus/fbreader/description/BookDescriptionUtil.java index 18b664bda..702a788e3 100644 --- a/src/org/fbreader/description/BookDescriptionUtil.java +++ b/src/org/geometerplus/fbreader/description/BookDescriptionUtil.java @@ -1,15 +1,15 @@ -package org.fbreader.description; +package org.geometerplus.fbreader.description; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.fbreader.description.BookDescription.BookInfo; -import org.fbreader.formats.FormatPlugin.PluginCollection; -import org.fbreader.option.FBOptions; -import org.zlibrary.core.filesystem.ZLDir; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.options.ZLStringOption; +import org.geometerplus.fbreader.description.BookDescription.BookInfo; +import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection; +import org.geometerplus.fbreader.option.FBOptions; +import org.geometerplus.zlibrary.core.filesystem.ZLDir; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.options.ZLStringOption; public class BookDescriptionUtil { private static final String SIZE = "Size"; diff --git a/src/org/fbreader/encoding/ZLEncodingCollection.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingCollection.java similarity index 86% rename from src/org/fbreader/encoding/ZLEncodingCollection.java rename to src/org/geometerplus/fbreader/encoding/ZLEncodingCollection.java index a98285869..4d4ecce85 100644 --- a/src/org/fbreader/encoding/ZLEncodingCollection.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingCollection.java @@ -1,13 +1,13 @@ -package org.fbreader.encoding; +package org.geometerplus.fbreader.encoding; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import org.zlibrary.core.config.ZLConfigManager; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.config.ZLConfigManager; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.options.ZLOption; public class ZLEncodingCollection { private static ZLEncodingCollection ourInstance; diff --git a/src/org/fbreader/encoding/ZLEncodingConverter.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverter.java similarity index 89% rename from src/org/fbreader/encoding/ZLEncodingConverter.java rename to src/org/geometerplus/fbreader/encoding/ZLEncodingConverter.java index 00daa8672..875df873a 100644 --- a/src/org/fbreader/encoding/ZLEncodingConverter.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverter.java @@ -1,4 +1,4 @@ -package org.fbreader.encoding; +package org.geometerplus.fbreader.encoding; public abstract class ZLEncodingConverter { protected ZLEncodingConverter() {} diff --git a/src/org/fbreader/encoding/ZLEncodingConverterInfo.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterInfo.java similarity index 94% rename from src/org/fbreader/encoding/ZLEncodingConverterInfo.java rename to src/org/geometerplus/fbreader/encoding/ZLEncodingConverterInfo.java index 6792525e1..1f5e36c1f 100644 --- a/src/org/fbreader/encoding/ZLEncodingConverterInfo.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterInfo.java @@ -1,4 +1,4 @@ -package org.fbreader.encoding; +package org.geometerplus.fbreader.encoding; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/org/fbreader/encoding/ZLEncodingConverterProvider.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterProvider.java similarity index 81% rename from src/org/fbreader/encoding/ZLEncodingConverterProvider.java rename to src/org/geometerplus/fbreader/encoding/ZLEncodingConverterProvider.java index 52cae9fdd..0b6c46d60 100644 --- a/src/org/fbreader/encoding/ZLEncodingConverterProvider.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterProvider.java @@ -1,4 +1,4 @@ -package org.fbreader.encoding; +package org.geometerplus.fbreader.encoding; public abstract class ZLEncodingConverterProvider { protected ZLEncodingConverterProvider() {} diff --git a/src/org/fbreader/encoding/ZLEncodingSet.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingSet.java similarity index 85% rename from src/org/fbreader/encoding/ZLEncodingSet.java rename to src/org/geometerplus/fbreader/encoding/ZLEncodingSet.java index f48fde15c..5a33d3379 100644 --- a/src/org/fbreader/encoding/ZLEncodingSet.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingSet.java @@ -1,4 +1,4 @@ -package org.fbreader.encoding; +package org.geometerplus.fbreader.encoding; import java.util.ArrayList; diff --git a/src/org/fbreader/encodingOption/EncodingEntry.java b/src/org/geometerplus/fbreader/encodingOption/EncodingEntry.java similarity index 83% rename from src/org/fbreader/encodingOption/EncodingEntry.java rename to src/org/geometerplus/fbreader/encodingOption/EncodingEntry.java index 4075c7c66..5279e8850 100644 --- a/src/org/fbreader/encodingOption/EncodingEntry.java +++ b/src/org/geometerplus/fbreader/encodingOption/EncodingEntry.java @@ -1,15 +1,15 @@ -package org.fbreader.encodingOption; +package org.geometerplus.fbreader.encodingOption; import java.util.ArrayList; import java.util.HashMap; -import org.fbreader.encoding.ZLEncodingCollection; -import org.fbreader.encoding.ZLEncodingConverterInfo; -import org.fbreader.encoding.ZLEncodingSet; -import org.zlibrary.core.options.ZLStringOption; -import org.zlibrary.core.util.*; +import org.geometerplus.fbreader.encoding.ZLEncodingCollection; +import org.geometerplus.fbreader.encoding.ZLEncodingConverterInfo; +import org.geometerplus.fbreader.encoding.ZLEncodingSet; +import org.geometerplus.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; public class EncodingEntry extends ZLComboOptionEntry { private static final String AUTO = "auto"; diff --git a/src/org/fbreader/encodingOption/EncodingSetEntry.java b/src/org/geometerplus/fbreader/encodingOption/EncodingSetEntry.java similarity index 79% rename from src/org/fbreader/encodingOption/EncodingSetEntry.java rename to src/org/geometerplus/fbreader/encodingOption/EncodingSetEntry.java index 5e7b4c2d7..8db1ce9bc 100644 --- a/src/org/fbreader/encodingOption/EncodingSetEntry.java +++ b/src/org/geometerplus/fbreader/encodingOption/EncodingSetEntry.java @@ -1,8 +1,8 @@ -package org.fbreader.encodingOption; +package org.geometerplus.fbreader.encodingOption; import java.util.ArrayList; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; public class EncodingSetEntry extends ZLComboOptionEntry { private EncodingEntry myEncodingEntry; diff --git a/src/org/fbreader/fbreader/ActionCode.java b/src/org/geometerplus/fbreader/fbreader/ActionCode.java similarity index 97% rename from src/org/fbreader/fbreader/ActionCode.java rename to src/org/geometerplus/fbreader/fbreader/ActionCode.java index 73e886ea1..46154cebc 100644 --- a/src/org/fbreader/fbreader/ActionCode.java +++ b/src/org/geometerplus/fbreader/fbreader/ActionCode.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; public interface ActionCode { String SHOW_COLLECTION = "showLibrary"; diff --git a/src/org/fbreader/fbreader/AddBookAction.java b/src/org/geometerplus/fbreader/fbreader/AddBookAction.java similarity index 83% rename from src/org/fbreader/fbreader/AddBookAction.java rename to src/org/geometerplus/fbreader/fbreader/AddBookAction.java index 19ebdf771..80dbd934a 100644 --- a/src/org/fbreader/fbreader/AddBookAction.java +++ b/src/org/geometerplus/fbreader/fbreader/AddBookAction.java @@ -1,8 +1,8 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.fbreader.collection.*; -import org.fbreader.description.BookDescription; -import org.zlibrary.core.dialogs.ZLDialogManager; +import org.geometerplus.fbreader.collection.*; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; class AddBookAction extends FBAction { AddBookAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/BookInfoDialog.java b/src/org/geometerplus/fbreader/fbreader/BookInfoDialog.java similarity index 90% rename from src/org/fbreader/fbreader/BookInfoDialog.java rename to src/org/geometerplus/fbreader/fbreader/BookInfoDialog.java index f9eb7b6cc..891a2d57f 100644 --- a/src/org/fbreader/fbreader/BookInfoDialog.java +++ b/src/org/geometerplus/fbreader/fbreader/BookInfoDialog.java @@ -1,16 +1,16 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; import java.util.*; -import org.fbreader.collection.BookCollection; -import org.fbreader.description.*; -import org.fbreader.formats.FormatPlugin; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.language.ZLLanguageList; -import org.zlibrary.core.optionEntries.*; -import org.fbreader.encodingOption.*; -import org.fbreader.encodingOption.EncodingEntry; +import org.geometerplus.fbreader.collection.BookCollection; +import org.geometerplus.fbreader.description.*; +import org.geometerplus.fbreader.formats.FormatPlugin; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.language.ZLLanguageList; +import org.geometerplus.zlibrary.core.optionEntries.*; +import org.geometerplus.fbreader.encodingOption.*; +import org.geometerplus.fbreader.encodingOption.EncodingEntry; public class BookInfoDialog { private final ZLOptionsDialog myDialog; diff --git a/src/org/fbreader/fbreader/BookTextView.java b/src/org/geometerplus/fbreader/fbreader/BookTextView.java similarity index 93% rename from src/org/fbreader/fbreader/BookTextView.java rename to src/org/geometerplus/fbreader/fbreader/BookTextView.java index e1296dcab..876c660f4 100644 --- a/src/org/fbreader/fbreader/BookTextView.java +++ b/src/org/geometerplus/fbreader/fbreader/BookTextView.java @@ -1,14 +1,14 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.fbreader.bookmodel.FBTextKind; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.options.*; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.text.model.ZLTextModel; -import org.zlibrary.text.view.impl.*; +import org.geometerplus.fbreader.bookmodel.FBTextKind; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.view.impl.*; public class BookTextView extends FBView { private static final String BUFFER_SIZE = "UndoBufferSize"; diff --git a/src/org/fbreader/fbreader/CancelAction.java b/src/org/geometerplus/fbreader/fbreader/CancelAction.java similarity index 89% rename from src/org/fbreader/fbreader/CancelAction.java rename to src/org/geometerplus/fbreader/fbreader/CancelAction.java index 678abb0ff..3d01cb1f6 100644 --- a/src/org/fbreader/fbreader/CancelAction.java +++ b/src/org/geometerplus/fbreader/fbreader/CancelAction.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; class CancelAction extends FBAction { CancelAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/ChangeFontSizeAction.java b/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java similarity index 68% rename from src/org/fbreader/fbreader/ChangeFontSizeAction.java rename to src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java index fd1f9d49c..04b472d04 100644 --- a/src/org/fbreader/fbreader/ChangeFontSizeAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java @@ -1,7 +1,7 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.text.view.style.ZLTextStyleCollection; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.text.view.style.ZLTextStyleCollection; class ChangeFontSizeAction extends FBAction { ChangeFontSizeAction(FBReader fbreader, int delta) { diff --git a/src/org/fbreader/fbreader/CollectionModel.java b/src/org/geometerplus/fbreader/fbreader/CollectionModel.java similarity index 88% rename from src/org/fbreader/fbreader/CollectionModel.java rename to src/org/geometerplus/fbreader/fbreader/CollectionModel.java index a5e7ff231..ce81ada3c 100644 --- a/src/org/fbreader/fbreader/CollectionModel.java +++ b/src/org/geometerplus/fbreader/fbreader/CollectionModel.java @@ -1,16 +1,16 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.image.*; -import org.zlibrary.text.model.*; -import org.zlibrary.text.model.impl.ZLTextTreeModelImpl; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.image.*; +import org.geometerplus.zlibrary.text.model.*; +import org.geometerplus.zlibrary.text.model.impl.ZLTextTreeModelImpl; -import org.fbreader.bookmodel.FBTextKind; -import org.fbreader.collection.*; -import org.fbreader.description.*; +import org.geometerplus.fbreader.bookmodel.FBTextKind; +import org.geometerplus.fbreader.collection.*; +import org.geometerplus.fbreader.description.*; class CollectionModel extends ZLTextTreeModelImpl { static final String RemoveBookImageId = "removeBook"; diff --git a/src/org/fbreader/fbreader/CollectionView.java b/src/org/geometerplus/fbreader/fbreader/CollectionView.java similarity index 86% rename from src/org/fbreader/fbreader/CollectionView.java rename to src/org/geometerplus/fbreader/fbreader/CollectionView.java index 5832134d0..b567e7f55 100644 --- a/src/org/fbreader/fbreader/CollectionView.java +++ b/src/org/geometerplus/fbreader/fbreader/CollectionView.java @@ -1,16 +1,16 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.dialogs.ZLDialogManager; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.text.model.*; -import org.zlibrary.text.view.ZLTextView; -import org.zlibrary.text.view.impl.*; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.text.model.*; +import org.geometerplus.zlibrary.text.view.ZLTextView; +import org.geometerplus.zlibrary.text.view.impl.*; -import org.fbreader.collection.*; -import org.fbreader.description.*; +import org.geometerplus.fbreader.collection.*; +import org.geometerplus.fbreader.description.*; public class CollectionView extends FBView { private final BookCollection myCollection = new BookCollection(); diff --git a/src/org/fbreader/fbreader/ContentsView.java b/src/org/geometerplus/fbreader/fbreader/ContentsView.java similarity index 85% rename from src/org/fbreader/fbreader/ContentsView.java rename to src/org/geometerplus/fbreader/fbreader/ContentsView.java index 8dcf82b6e..affa6dd0e 100644 --- a/src/org/fbreader/fbreader/ContentsView.java +++ b/src/org/geometerplus/fbreader/fbreader/ContentsView.java @@ -1,11 +1,11 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.core.options.*; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.text.model.*; -import org.zlibrary.text.view.impl.ZLTextWordCursor; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.text.model.*; +import org.geometerplus.zlibrary.text.view.impl.ZLTextWordCursor; -import org.fbreader.bookmodel.ContentsModel; +import org.geometerplus.fbreader.bookmodel.ContentsModel; class ContentsView extends FBView { ContentsView(FBReader fbreader, ZLPaintContext context) { diff --git a/src/org/fbreader/fbreader/DummyAction.java b/src/org/geometerplus/fbreader/fbreader/DummyAction.java similarity index 83% rename from src/org/fbreader/fbreader/DummyAction.java rename to src/org/geometerplus/fbreader/fbreader/DummyAction.java index 63fd0acfd..5a03c9818 100644 --- a/src/org/fbreader/fbreader/DummyAction.java +++ b/src/org/geometerplus/fbreader/fbreader/DummyAction.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; class DummyAction extends FBAction { DummyAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/FBAction.java b/src/org/geometerplus/fbreader/fbreader/FBAction.java similarity index 62% rename from src/org/fbreader/fbreader/FBAction.java rename to src/org/geometerplus/fbreader/fbreader/FBAction.java index c45fc3615..27a654ae7 100644 --- a/src/org/fbreader/fbreader/FBAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FBAction.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.application.ZLApplication; abstract class FBAction extends ZLApplication.ZLAction { private final FBReader myFBReader; diff --git a/src/org/fbreader/fbreader/FBFileHandler.java b/src/org/geometerplus/fbreader/fbreader/FBFileHandler.java similarity index 88% rename from src/org/fbreader/fbreader/FBFileHandler.java rename to src/org/geometerplus/fbreader/fbreader/FBFileHandler.java index 14b5e04de..8301abbb1 100644 --- a/src/org/fbreader/fbreader/FBFileHandler.java +++ b/src/org/geometerplus/fbreader/fbreader/FBFileHandler.java @@ -1,14 +1,14 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; import java.util.*; -import org.fbreader.description.BookDescription; -import org.fbreader.formats.FormatPlugin; -import org.fbreader.formats.FormatPlugin.PluginCollection; -import org.zlibrary.core.options.*; -import org.zlibrary.core.util.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.filesystem.*; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.formats.FormatPlugin; +import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.filesystem.*; public class FBFileHandler extends ZLTreeOpenHandler { private final ZLStringOption DirectoryOption = diff --git a/src/org/fbreader/fbreader/FBIndicatorInfo.java b/src/org/geometerplus/fbreader/fbreader/FBIndicatorInfo.java similarity index 89% rename from src/org/fbreader/fbreader/FBIndicatorInfo.java rename to src/org/geometerplus/fbreader/fbreader/FBIndicatorInfo.java index 729253360..c0317af45 100644 --- a/src/org/fbreader/fbreader/FBIndicatorInfo.java +++ b/src/org/geometerplus/fbreader/fbreader/FBIndicatorInfo.java @@ -1,8 +1,8 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.core.options.*; -import org.zlibrary.core.util.ZLColor; -import org.zlibrary.text.view.ZLTextIndicatorInfo; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.text.view.ZLTextIndicatorInfo; public class FBIndicatorInfo extends ZLTextIndicatorInfo { private static final String INDICATOR = "Indicator"; diff --git a/src/org/fbreader/fbreader/FBReader.java b/src/org/geometerplus/fbreader/fbreader/FBReader.java similarity index 93% rename from src/org/fbreader/fbreader/FBReader.java rename to src/org/geometerplus/fbreader/fbreader/FBReader.java index 0a82b8c90..aaae52cb7 100644 --- a/src/org/fbreader/fbreader/FBReader.java +++ b/src/org/geometerplus/fbreader/fbreader/FBReader.java @@ -1,21 +1,21 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; import java.io.*; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.collection.BookCollection; -import org.fbreader.description.BookDescription; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.application.ZLKeyBindings; -import org.zlibrary.core.dialogs.ZLDialogManager; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.options.*; -import org.zlibrary.core.view.ZLViewWidget; -import org.zlibrary.text.model.ZLTextModel; -import org.zlibrary.text.view.ZLTextView; -import org.zlibrary.text.hyphenation.ZLTextHyphenator; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.collection.BookCollection; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.application.ZLKeyBindings; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.view.ZLTextView; +import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator; public final class FBReader extends ZLApplication { static interface ViewMode { diff --git a/src/org/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java similarity index 90% rename from src/org/fbreader/fbreader/FBView.java rename to src/org/geometerplus/fbreader/fbreader/FBView.java index 1cca7629c..0c964129d 100644 --- a/src/org/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -1,9 +1,9 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.core.options.*; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.text.view.*; -import org.zlibrary.text.view.impl.*; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.text.view.*; +import org.geometerplus.zlibrary.text.view.impl.*; public abstract class FBView extends ZLTextViewImpl { private static ZLIntegerRangeOption ourLeftMarginOption; diff --git a/src/org/fbreader/fbreader/FindNextAction.java b/src/org/geometerplus/fbreader/fbreader/FindNextAction.java similarity index 74% rename from src/org/fbreader/fbreader/FindNextAction.java rename to src/org/geometerplus/fbreader/fbreader/FindNextAction.java index f64255be7..1990a1ec4 100644 --- a/src/org/fbreader/fbreader/FindNextAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FindNextAction.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.text.view.ZLTextView; +import org.geometerplus.zlibrary.text.view.ZLTextView; class FindNextAction extends FBAction { FindNextAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/FindPreviousAction.java b/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java similarity index 75% rename from src/org/fbreader/fbreader/FindPreviousAction.java rename to src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java index e8ff48167..30867a567 100644 --- a/src/org/fbreader/fbreader/FindPreviousAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.text.view.ZLTextView; +import org.geometerplus.zlibrary.text.view.ZLTextView; class FindPreviousAction extends FBAction { FindPreviousAction(FBReader fbreader) { diff --git a/src/org/geometerplus/fbreader/fbreader/FootnoteView.java b/src/org/geometerplus/fbreader/fbreader/FootnoteView.java new file mode 100644 index 000000000..de5c9c288 --- /dev/null +++ b/src/org/geometerplus/fbreader/fbreader/FootnoteView.java @@ -0,0 +1,10 @@ +package org.geometerplus.fbreader.fbreader; + +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.text.model.ZLTextModel; + +public final class FootnoteView extends FBView { + FootnoteView(FBReader fbreader, ZLPaintContext context) { + super(fbreader, context); + } +} diff --git a/src/org/fbreader/fbreader/QuitAction.java b/src/org/geometerplus/fbreader/fbreader/QuitAction.java similarity index 73% rename from src/org/fbreader/fbreader/QuitAction.java rename to src/org/geometerplus/fbreader/fbreader/QuitAction.java index 91dcd45ab..493e83fdb 100644 --- a/src/org/fbreader/fbreader/QuitAction.java +++ b/src/org/geometerplus/fbreader/fbreader/QuitAction.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; class QuitAction extends FBAction { QuitAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/RecentBooksView.java b/src/org/geometerplus/fbreader/fbreader/RecentBooksView.java similarity index 75% rename from src/org/fbreader/fbreader/RecentBooksView.java rename to src/org/geometerplus/fbreader/fbreader/RecentBooksView.java index a950f5975..9501d5e09 100644 --- a/src/org/fbreader/fbreader/RecentBooksView.java +++ b/src/org/geometerplus/fbreader/fbreader/RecentBooksView.java @@ -1,16 +1,16 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.ZLTextPlainModel; -import org.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextPlainModel; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; -import org.fbreader.bookmodel.FBTextKind; -import org.fbreader.collection.BookCollection; -import org.fbreader.description.BookDescription; +import org.geometerplus.fbreader.bookmodel.FBTextKind; +import org.geometerplus.fbreader.collection.BookCollection; +import org.geometerplus.fbreader.description.BookDescription; public class RecentBooksView extends FBView { private static final String LIBRARY = "Recent Books"; diff --git a/src/org/fbreader/fbreader/RedoAction.java b/src/org/geometerplus/fbreader/fbreader/RedoAction.java similarity index 89% rename from src/org/fbreader/fbreader/RedoAction.java rename to src/org/geometerplus/fbreader/fbreader/RedoAction.java index 00f6fc122..ae7939fe4 100644 --- a/src/org/fbreader/fbreader/RedoAction.java +++ b/src/org/geometerplus/fbreader/fbreader/RedoAction.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; class RedoAction extends FBAction { RedoAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/ScrollToHomeAction.java b/src/org/geometerplus/fbreader/fbreader/ScrollToHomeAction.java similarity index 88% rename from src/org/fbreader/fbreader/ScrollToHomeAction.java rename to src/org/geometerplus/fbreader/fbreader/ScrollToHomeAction.java index 47fba1a1b..f243fd66a 100644 --- a/src/org/fbreader/fbreader/ScrollToHomeAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ScrollToHomeAction.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; class ScrollToHomeAction extends FBAction { ScrollToHomeAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/ScrollingAction.java b/src/org/geometerplus/fbreader/fbreader/ScrollingAction.java similarity index 90% rename from src/org/fbreader/fbreader/ScrollingAction.java rename to src/org/geometerplus/fbreader/fbreader/ScrollingAction.java index b4ee5f783..f06798e38 100644 --- a/src/org/fbreader/fbreader/ScrollingAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ScrollingAction.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.text.view.ZLTextView; +import org.geometerplus.zlibrary.text.view.ZLTextView; class ScrollingAction extends FBAction { private final ScrollingOptions myOptions; diff --git a/src/org/fbreader/fbreader/ScrollingOptions.java b/src/org/geometerplus/fbreader/fbreader/ScrollingOptions.java similarity index 90% rename from src/org/fbreader/fbreader/ScrollingOptions.java rename to src/org/geometerplus/fbreader/fbreader/ScrollingOptions.java index 7d3ab6f3b..7cb8ea177 100644 --- a/src/org/fbreader/fbreader/ScrollingOptions.java +++ b/src/org/geometerplus/fbreader/fbreader/ScrollingOptions.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.options.*; public final class ScrollingOptions { public final ZLIntegerRangeOption DelayOption; diff --git a/src/org/fbreader/fbreader/SearchAction.java b/src/org/geometerplus/fbreader/fbreader/SearchAction.java similarity index 87% rename from src/org/fbreader/fbreader/SearchAction.java rename to src/org/geometerplus/fbreader/fbreader/SearchAction.java index 9e4b3983b..4ca4976fa 100644 --- a/src/org/fbreader/fbreader/SearchAction.java +++ b/src/org/geometerplus/fbreader/fbreader/SearchAction.java @@ -1,10 +1,10 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.fbreader.option.FBOptions; -import org.zlibrary.core.options.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.text.view.ZLTextView; +import org.geometerplus.fbreader.option.FBOptions; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.text.view.ZLTextView; class SearchAction extends FBAction { public static final String SEARCH = "Search"; diff --git a/src/org/fbreader/fbreader/SearchPatternEntry.java b/src/org/geometerplus/fbreader/fbreader/SearchPatternEntry.java similarity index 84% rename from src/org/fbreader/fbreader/SearchPatternEntry.java rename to src/org/geometerplus/fbreader/fbreader/SearchPatternEntry.java index 78f294a0d..4a4a3d764 100644 --- a/src/org/fbreader/fbreader/SearchPatternEntry.java +++ b/src/org/geometerplus/fbreader/fbreader/SearchPatternEntry.java @@ -1,10 +1,10 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; import java.util.ArrayList; -import org.fbreader.option.FBOptions; -import org.zlibrary.core.options.ZLStringOption; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.fbreader.option.FBOptions; +import org.geometerplus.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; class SearchPatternEntry extends ZLComboOptionEntry { SearchAction myAction; diff --git a/src/org/fbreader/fbreader/SetModeAction.java b/src/org/geometerplus/fbreader/fbreader/SetModeAction.java similarity index 90% rename from src/org/fbreader/fbreader/SetModeAction.java rename to src/org/geometerplus/fbreader/fbreader/SetModeAction.java index e212f22b5..1028808b2 100644 --- a/src/org/fbreader/fbreader/SetModeAction.java +++ b/src/org/geometerplus/fbreader/fbreader/SetModeAction.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; class SetModeAction extends FBAction { SetModeAction(FBReader fbreader, int modeToSet, int visibleInModes) { diff --git a/src/org/fbreader/fbreader/ShowBookInfoDialogAction.java b/src/org/geometerplus/fbreader/fbreader/ShowBookInfoDialogAction.java similarity index 85% rename from src/org/fbreader/fbreader/ShowBookInfoDialogAction.java rename to src/org/geometerplus/fbreader/fbreader/ShowBookInfoDialogAction.java index a70879134..d1dd305af 100644 --- a/src/org/fbreader/fbreader/ShowBookInfoDialogAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowBookInfoDialogAction.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.fbreader.collection.BookCollection; +import org.geometerplus.fbreader.collection.BookCollection; class ShowBookInfoDialogAction extends FBAction { ShowBookInfoDialogAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/ShowContentsAction.java b/src/org/geometerplus/fbreader/fbreader/ShowContentsAction.java similarity index 90% rename from src/org/fbreader/fbreader/ShowContentsAction.java rename to src/org/geometerplus/fbreader/fbreader/ShowContentsAction.java index 1739c2b86..f5617a935 100644 --- a/src/org/fbreader/fbreader/ShowContentsAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowContentsAction.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; class ShowContentsAction extends FBAction { ShowContentsAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/ShowHelpAction.java b/src/org/geometerplus/fbreader/fbreader/ShowHelpAction.java similarity index 71% rename from src/org/fbreader/fbreader/ShowHelpAction.java rename to src/org/geometerplus/fbreader/fbreader/ShowHelpAction.java index d830eae60..eca08ac7e 100644 --- a/src/org/fbreader/fbreader/ShowHelpAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowHelpAction.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.fbreader.description.BookDescription; +import org.geometerplus.fbreader.description.BookDescription; class ShowHelpAction extends FBAction { ShowHelpAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/ShowOptionsDialogAction.java b/src/org/geometerplus/fbreader/fbreader/ShowOptionsDialogAction.java similarity index 62% rename from src/org/fbreader/fbreader/ShowOptionsDialogAction.java rename to src/org/geometerplus/fbreader/fbreader/ShowOptionsDialogAction.java index f07941198..9bec66dbb 100644 --- a/src/org/fbreader/fbreader/ShowOptionsDialogAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowOptionsDialogAction.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.fbreader.optionsDialog.OptionsDialog; +import org.geometerplus.fbreader.optionsDialog.OptionsDialog; class ShowOptionsDialogAction extends FBAction { ShowOptionsDialogAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/ToggleIndicatorAction.java b/src/org/geometerplus/fbreader/fbreader/ToggleIndicatorAction.java similarity index 74% rename from src/org/fbreader/fbreader/ToggleIndicatorAction.java rename to src/org/geometerplus/fbreader/fbreader/ToggleIndicatorAction.java index ce13fdc23..921f9eb87 100644 --- a/src/org/fbreader/fbreader/ToggleIndicatorAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ToggleIndicatorAction.java @@ -1,6 +1,6 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; -import org.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; class ToggleIndicatorAction extends FBAction { ToggleIndicatorAction(FBReader fbreader) { diff --git a/src/org/fbreader/fbreader/UndoAction.java b/src/org/geometerplus/fbreader/fbreader/UndoAction.java similarity index 91% rename from src/org/fbreader/fbreader/UndoAction.java rename to src/org/geometerplus/fbreader/fbreader/UndoAction.java index 7c0f30afd..998a7eff8 100644 --- a/src/org/fbreader/fbreader/UndoAction.java +++ b/src/org/geometerplus/fbreader/fbreader/UndoAction.java @@ -1,4 +1,4 @@ -package org.fbreader.fbreader; +package org.geometerplus.fbreader.fbreader; class UndoAction extends FBAction { UndoAction(FBReader fbreader) { diff --git a/src/org/geometerplus/fbreader/formats/EncodedTextReader.java b/src/org/geometerplus/fbreader/formats/EncodedTextReader.java new file mode 100644 index 000000000..34ee27db5 --- /dev/null +++ b/src/org/geometerplus/fbreader/formats/EncodedTextReader.java @@ -0,0 +1,5 @@ +package org.geometerplus.fbreader.formats; + +public class EncodedTextReader { + +} diff --git a/src/org/fbreader/formats/FormatPlugin.java b/src/org/geometerplus/fbreader/formats/FormatPlugin.java similarity index 86% rename from src/org/fbreader/formats/FormatPlugin.java rename to src/org/geometerplus/fbreader/formats/FormatPlugin.java index 65efe439a..437e4e816 100644 --- a/src/org/fbreader/formats/FormatPlugin.java +++ b/src/org/geometerplus/fbreader/formats/FormatPlugin.java @@ -1,19 +1,19 @@ -package org.fbreader.formats; +package org.geometerplus.fbreader.formats; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.description.BookDescription; -import org.fbreader.description.BookDescription.WritableBookDescription; -import org.fbreader.formats.fb2.FB2Plugin; -import org.fbreader.formats.html.HtmlPlugin; -import org.fbreader.formats.oeb.OEBPlugin; -import org.zlibrary.core.dialogs.ZLOptionsDialog; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.language.ZLLanguageDetector; -import org.zlibrary.core.options.*; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.description.BookDescription.WritableBookDescription; +import org.geometerplus.fbreader.formats.fb2.FB2Plugin; +import org.geometerplus.fbreader.formats.html.HtmlPlugin; +import org.geometerplus.fbreader.formats.oeb.OEBPlugin; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionsDialog; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.language.ZLLanguageDetector; +import org.geometerplus.zlibrary.core.options.*; public abstract class FormatPlugin { public abstract boolean providesMetaInfo(); diff --git a/src/org/fbreader/formats/fb2/Base64EncodedImage.java b/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java similarity index 91% rename from src/org/fbreader/formats/fb2/Base64EncodedImage.java rename to src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java index f77da4ca3..1c92fcbd6 100644 --- a/src/org/fbreader/formats/fb2/Base64EncodedImage.java +++ b/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java @@ -1,7 +1,7 @@ -package org.fbreader.formats.fb2; +package org.geometerplus.fbreader.formats.fb2; -import org.zlibrary.core.util.ZLTextBuffer; -import org.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.core.util.ZLTextBuffer; +import org.geometerplus.zlibrary.core.image.ZLImage; final class Base64EncodedImage implements ZLImage { private ZLTextBuffer myEncodedData = new ZLTextBuffer(); diff --git a/src/org/fbreader/formats/fb2/FB2DescriptionReader.java b/src/org/geometerplus/fbreader/formats/fb2/FB2DescriptionReader.java similarity index 87% rename from src/org/fbreader/formats/fb2/FB2DescriptionReader.java rename to src/org/geometerplus/fbreader/formats/fb2/FB2DescriptionReader.java index 080d1726a..05482008c 100644 --- a/src/org/fbreader/formats/fb2/FB2DescriptionReader.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2DescriptionReader.java @@ -1,11 +1,11 @@ -package org.fbreader.formats.fb2; +package org.geometerplus.fbreader.formats.fb2; -import org.fbreader.description.BookDescription; -import org.fbreader.description.BookDescription.WritableBookDescription; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLProcessor; -import org.zlibrary.core.xml.ZLXMLProcessorFactory; -import org.zlibrary.core.xml.ZLXMLReaderAdapter; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.description.BookDescription.WritableBookDescription; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessor; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessorFactory; +import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; public class FB2DescriptionReader extends ZLXMLReaderAdapter { private WritableBookDescription myDescription; diff --git a/src/org/fbreader/formats/fb2/FB2Plugin.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java similarity index 64% rename from src/org/fbreader/formats/fb2/FB2Plugin.java rename to src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java index 5e075043c..02bc081f5 100644 --- a/src/org/fbreader/formats/fb2/FB2Plugin.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java @@ -1,9 +1,9 @@ -package org.fbreader.formats.fb2; +package org.geometerplus.fbreader.formats.fb2; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.description.BookDescription; -import org.fbreader.formats.FormatPlugin; -import org.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.formats.FormatPlugin; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; public class FB2Plugin extends FormatPlugin { public boolean providesMetaInfo() { diff --git a/src/org/fbreader/formats/fb2/FB2Reader.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java similarity index 93% rename from src/org/fbreader/formats/fb2/FB2Reader.java rename to src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java index 5b5b91020..fe241c7b9 100644 --- a/src/org/fbreader/formats/fb2/FB2Reader.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java @@ -1,11 +1,11 @@ -package org.fbreader.formats.fb2; +package org.geometerplus.fbreader.formats.fb2; import java.util.*; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.util.*; -import org.fbreader.bookmodel.*; -import org.zlibrary.core.xml.*; -import org.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.util.*; +import org.geometerplus.fbreader.bookmodel.*; +import org.geometerplus.zlibrary.core.xml.*; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; public final class FB2Reader extends BookReader implements ZLXMLReader { private boolean myInsidePoem = false; diff --git a/src/org/fbreader/formats/fb2/FB2Tag.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java similarity index 94% rename from src/org/fbreader/formats/fb2/FB2Tag.java rename to src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java index 6aaf4b266..b511f8044 100644 --- a/src/org/fbreader/formats/fb2/FB2Tag.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java @@ -1,7 +1,7 @@ -package org.fbreader.formats.fb2; +package org.geometerplus.fbreader.formats.fb2; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; final class FB2Tag { public static final byte UNKNOWN = 0; diff --git a/src/org/fbreader/formats/html/HtmlDescriptionReader.java b/src/org/geometerplus/fbreader/formats/html/HtmlDescriptionReader.java similarity index 72% rename from src/org/fbreader/formats/html/HtmlDescriptionReader.java rename to src/org/geometerplus/fbreader/formats/html/HtmlDescriptionReader.java index b3f1315df..923d54ebe 100644 --- a/src/org/fbreader/formats/html/HtmlDescriptionReader.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlDescriptionReader.java @@ -1,11 +1,11 @@ -package org.fbreader.formats.html; +package org.geometerplus.fbreader.formats.html; -import org.fbreader.description.BookDescription; -import org.fbreader.description.BookDescription.WritableBookDescription; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLProcessor; -import org.zlibrary.core.xml.ZLXMLProcessorFactory; -import org.zlibrary.core.xml.ZLXMLReaderAdapter; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.description.BookDescription.WritableBookDescription; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessor; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessorFactory; +import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; public class HtmlDescriptionReader extends ZLXMLReaderAdapter { diff --git a/src/org/fbreader/formats/html/HtmlPlugin.java b/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java similarity index 64% rename from src/org/fbreader/formats/html/HtmlPlugin.java rename to src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java index 583b1b9d3..78764a614 100644 --- a/src/org/fbreader/formats/html/HtmlPlugin.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java @@ -1,12 +1,12 @@ -package org.fbreader.formats.html; +package org.geometerplus.fbreader.formats.html; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.description.BookDescription; -import org.fbreader.description.BookDescription.WritableBookDescription; -import org.fbreader.formats.FormatPlugin; -import org.fbreader.formats.fb2.FB2DescriptionReader; -import org.fbreader.formats.fb2.FB2Reader; -import org.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.description.BookDescription.WritableBookDescription; +import org.geometerplus.fbreader.formats.FormatPlugin; +import org.geometerplus.fbreader.formats.fb2.FB2DescriptionReader; +import org.geometerplus.fbreader.formats.fb2.FB2Reader; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; public class HtmlPlugin extends FormatPlugin { diff --git a/src/org/fbreader/formats/html/HtmlReader.java b/src/org/geometerplus/fbreader/formats/html/HtmlReader.java similarity index 88% rename from src/org/fbreader/formats/html/HtmlReader.java rename to src/org/geometerplus/fbreader/formats/html/HtmlReader.java index c19daf55d..7733f9433 100644 --- a/src/org/fbreader/formats/html/HtmlReader.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlReader.java @@ -1,18 +1,18 @@ -package org.fbreader.formats.html; +package org.geometerplus.fbreader.formats.html; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.bookmodel.BookReader; -import org.fbreader.bookmodel.FBTextKind; -import org.fbreader.formats.html.HtmlTag; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLProcessor; -import org.zlibrary.core.xml.ZLXMLProcessorFactory; -import org.zlibrary.core.html.ZLHtmlProcessor; -import org.zlibrary.core.html.ZLHtmlProcessorFactory; -import org.zlibrary.core.html.ZLHtmlReader; -import org.zlibrary.core.image.ZLFileImage; -import org.zlibrary.core.util.ZLArrayUtils; -import org.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.bookmodel.BookReader; +import org.geometerplus.fbreader.bookmodel.FBTextKind; +import org.geometerplus.fbreader.formats.html.HtmlTag; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessor; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessorFactory; +import org.geometerplus.zlibrary.core.html.ZLHtmlProcessor; +import org.geometerplus.zlibrary.core.html.ZLHtmlProcessorFactory; +import org.geometerplus.zlibrary.core.html.ZLHtmlReader; +import org.geometerplus.zlibrary.core.image.ZLFileImage; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; public class HtmlReader extends BookReader implements ZLHtmlReader { diff --git a/src/org/fbreader/formats/html/HtmlTag.java b/src/org/geometerplus/fbreader/formats/html/HtmlTag.java similarity index 93% rename from src/org/fbreader/formats/html/HtmlTag.java rename to src/org/geometerplus/fbreader/formats/html/HtmlTag.java index a8896f060..eca7dc0bd 100644 --- a/src/org/fbreader/formats/html/HtmlTag.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlTag.java @@ -1,7 +1,7 @@ -package org.fbreader.formats.html; +package org.geometerplus.fbreader.formats.html; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; final class HtmlTag { public static final byte HTML = -1; diff --git a/src/org/fbreader/formats/oeb/OEBPlugin.java b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java similarity index 84% rename from src/org/fbreader/formats/oeb/OEBPlugin.java rename to src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java index bf9536325..d6abb0cb8 100644 --- a/src/org/fbreader/formats/oeb/OEBPlugin.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java @@ -1,11 +1,11 @@ -package org.fbreader.formats.oeb; +package org.geometerplus.fbreader.formats.oeb; import java.util.ArrayList; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.description.BookDescription; -import org.fbreader.formats.FormatPlugin; -import org.zlibrary.core.filesystem.*; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.formats.FormatPlugin; +import org.geometerplus.zlibrary.core.filesystem.*; public class OEBPlugin extends FormatPlugin { public boolean providesMetaInfo() { diff --git a/src/org/fbreader/formats/pdb/PdbPlugin.java b/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java similarity index 78% rename from src/org/fbreader/formats/pdb/PdbPlugin.java rename to src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java index 3bba59bf1..f2a79a2d6 100644 --- a/src/org/fbreader/formats/pdb/PdbPlugin.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java @@ -1,13 +1,13 @@ -package org.fbreader.formats.pdb; +package org.geometerplus.fbreader.formats.pdb; import java.io.IOException; import java.io.InputStream; -import org.fbreader.description.BookDescriptionUtil; -import org.fbreader.formats.FormatPlugin; -import org.fbreader.option.FBOptions; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.options.ZLStringOption; +import org.geometerplus.fbreader.description.BookDescriptionUtil; +import org.geometerplus.fbreader.formats.FormatPlugin; +import org.geometerplus.fbreader.option.FBOptions; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.options.ZLStringOption; public abstract class PdbPlugin extends FormatPlugin { diff --git a/src/org/fbreader/formats/pdb/PdbStream.java b/src/org/geometerplus/fbreader/formats/pdb/PdbStream.java similarity index 89% rename from src/org/fbreader/formats/pdb/PdbStream.java rename to src/org/geometerplus/fbreader/formats/pdb/PdbStream.java index c306a4022..2f1623d4e 100644 --- a/src/org/fbreader/formats/pdb/PdbStream.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbStream.java @@ -1,11 +1,11 @@ -package org.fbreader.formats.pdb; +package org.geometerplus.fbreader.formats.pdb; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import org.fbreader.formats.pdb.PdbUtil.PdbHeader; -import org.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.fbreader.formats.pdb.PdbUtil.PdbHeader; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; public abstract class PdbStream extends InputStream { diff --git a/src/org/fbreader/formats/pdb/PdbUtil.java b/src/org/geometerplus/fbreader/formats/pdb/PdbUtil.java similarity index 94% rename from src/org/fbreader/formats/pdb/PdbUtil.java rename to src/org/geometerplus/fbreader/formats/pdb/PdbUtil.java index dde8ae632..cd6253931 100644 --- a/src/org/fbreader/formats/pdb/PdbUtil.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbUtil.java @@ -1,4 +1,4 @@ -package org.fbreader.formats.pdb; +package org.geometerplus.fbreader.formats.pdb; import java.io.IOException; import java.io.InputStream; diff --git a/src/org/fbreader/formats/plucker/PluckerBookReader.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java similarity index 91% rename from src/org/fbreader/formats/plucker/PluckerBookReader.java rename to src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java index 518799b25..8b3b60485 100644 --- a/src/org/fbreader/formats/plucker/PluckerBookReader.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java @@ -1,4 +1,4 @@ -package org.fbreader.formats.plucker; +package org.geometerplus.fbreader.formats.plucker; import java.io.IOException; import java.io.InputStream; @@ -6,18 +6,18 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.bookmodel.BookReader; -import org.fbreader.bookmodel.FBTextKind; -import org.fbreader.formats.pdb.PdbStream; -import org.fbreader.formats.pdb.PdbUtil; -import org.fbreader.formats.pdb.PdbUtil.PdbHeader; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.image.ZLImage; -import org.zlibrary.text.model.ZLTextAlignmentType; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.impl.ZLModelFactory; -import org.zlibrary.text.model.impl.ZLTextForcedControlEntry; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.bookmodel.BookReader; +import org.geometerplus.fbreader.bookmodel.FBTextKind; +import org.geometerplus.fbreader.formats.pdb.PdbStream; +import org.geometerplus.fbreader.formats.pdb.PdbUtil; +import org.geometerplus.fbreader.formats.pdb.PdbUtil.PdbHeader; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.text.model.impl.ZLTextForcedControlEntry; public class PluckerBookReader extends BookReader { diff --git a/src/org/fbreader/formats/plucker/PluckerPlugin.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java similarity index 75% rename from src/org/fbreader/formats/plucker/PluckerPlugin.java rename to src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java index 4bf4bd52d..8d36dc814 100644 --- a/src/org/fbreader/formats/plucker/PluckerPlugin.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java @@ -1,12 +1,12 @@ -package org.fbreader.formats.plucker; +package org.geometerplus.fbreader.formats.plucker; import java.io.IOException; import java.io.InputStream; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.description.BookDescription; -import org.fbreader.formats.pdb.PdbPlugin; -import org.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.formats.pdb.PdbPlugin; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; public class PluckerPlugin extends PdbPlugin { public boolean providesMetaInfo() { diff --git a/src/org/fbreader/formats/plucker/PluckerTextStream.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerTextStream.java similarity index 90% rename from src/org/fbreader/formats/plucker/PluckerTextStream.java rename to src/org/geometerplus/fbreader/formats/plucker/PluckerTextStream.java index c4373cbd3..f16468705 100644 --- a/src/org/fbreader/formats/plucker/PluckerTextStream.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerTextStream.java @@ -1,12 +1,12 @@ -package org.fbreader.formats.plucker; +package org.geometerplus.fbreader.formats.plucker; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import org.fbreader.formats.pdb.PdbStream; -import org.fbreader.formats.pdb.PdbUtil; -import org.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.fbreader.formats.pdb.PdbStream; +import org.geometerplus.fbreader.formats.pdb.PdbUtil; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; public class PluckerTextStream extends PdbStream { public PluckerTextStream(ZLFile file) { diff --git a/src/org/fbreader/formats/util/EncodingDetector.java b/src/org/geometerplus/fbreader/formats/util/EncodingDetector.java similarity index 92% rename from src/org/fbreader/formats/util/EncodingDetector.java rename to src/org/geometerplus/fbreader/formats/util/EncodingDetector.java index f73b8b620..6384febcc 100644 --- a/src/org/fbreader/formats/util/EncodingDetector.java +++ b/src/org/geometerplus/fbreader/formats/util/EncodingDetector.java @@ -1,4 +1,4 @@ -package org.fbreader.formats.util; +package org.geometerplus.fbreader.formats.util; import java.io.InputStream; diff --git a/src/org/fbreader/option/FBOptions.java b/src/org/geometerplus/fbreader/option/FBOptions.java similarity index 80% rename from src/org/fbreader/option/FBOptions.java rename to src/org/geometerplus/fbreader/option/FBOptions.java index 16ed15ec3..bfb6187d2 100644 --- a/src/org/fbreader/option/FBOptions.java +++ b/src/org/geometerplus/fbreader/option/FBOptions.java @@ -1,4 +1,4 @@ -package org.fbreader.option; +package org.geometerplus.fbreader.option; public class FBOptions { public final static String BOOKS_CATEGORY = "books"; diff --git a/src/org/fbreader/optionsDialog/ComboOptionEntry.java b/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java similarity index 86% rename from src/org/fbreader/optionsDialog/ComboOptionEntry.java rename to src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java index f1fd813b0..18787df03 100644 --- a/src/org/fbreader/optionsDialog/ComboOptionEntry.java +++ b/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java @@ -1,4 +1,4 @@ -package org.fbreader.optionsDialog; +package org.geometerplus.fbreader.optionsDialog; import java.util.ArrayList; import java.util.HashMap; @@ -7,8 +7,8 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; -import org.zlibrary.core.dialogs.ZLOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; class ComboOptionEntry extends ZLComboOptionEntry { protected final OptionsPage myPage; diff --git a/src/org/fbreader/optionsDialog/FormatOptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/FormatOptionsPage.java similarity index 80% rename from src/org/fbreader/optionsDialog/FormatOptionsPage.java rename to src/org/geometerplus/fbreader/optionsDialog/FormatOptionsPage.java index 27f2f69f4..9398d65e7 100644 --- a/src/org/fbreader/optionsDialog/FormatOptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/FormatOptionsPage.java @@ -1,16 +1,16 @@ -package org.fbreader.optionsDialog; +package org.geometerplus.fbreader.optionsDialog; -import org.zlibrary.core.dialogs.ZLDialogContent; -import org.zlibrary.core.optionEntries.ZLSimpleSpinOptionEntry; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.text.view.ZLTextAlignmentOptionEntry; -import org.zlibrary.text.view.ZLTextLineSpaceOptionEntry; -import org.zlibrary.text.view.style.ZLTextBaseStyle; -import org.zlibrary.text.view.style.ZLTextStyleCollection; -import org.zlibrary.text.view.style.ZLTextStyleDecoration; -import org.zlibrary.text.view.style.ZLTextFullStyleDecoration; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogContent; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleSpinOptionEntry; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.text.view.ZLTextAlignmentOptionEntry; +import org.geometerplus.zlibrary.text.view.ZLTextLineSpaceOptionEntry; +import org.geometerplus.zlibrary.text.view.style.ZLTextBaseStyle; +import org.geometerplus.zlibrary.text.view.style.ZLTextStyleCollection; +import org.geometerplus.zlibrary.text.view.style.ZLTextStyleDecoration; +import org.geometerplus.zlibrary.text.view.style.ZLTextFullStyleDecoration; -import static org.fbreader.bookmodel.FBTextKind.*; +import static org.geometerplus.fbreader.bookmodel.FBTextKind.*; public class FormatOptionsPage extends OptionsPage { private static final String KEY_STYLE = "style"; diff --git a/src/org/fbreader/optionsDialog/KeyBindingsPage.java b/src/org/geometerplus/fbreader/optionsDialog/KeyBindingsPage.java similarity index 91% rename from src/org/fbreader/optionsDialog/KeyBindingsPage.java rename to src/org/geometerplus/fbreader/optionsDialog/KeyBindingsPage.java index 42087e9b0..7a8f8bc45 100644 --- a/src/org/fbreader/optionsDialog/KeyBindingsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/KeyBindingsPage.java @@ -1,15 +1,15 @@ -package org.fbreader.optionsDialog; +package org.geometerplus.fbreader.optionsDialog; import java.util.ArrayList; -import org.zlibrary.core.application.*; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.options.*; -import org.zlibrary.core.optionEntries.*; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.core.application.*; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.optionEntries.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.view.ZLViewWidget; -import org.fbreader.fbreader.*; +import org.geometerplus.fbreader.fbreader.*; public class KeyBindingsPage { diff --git a/src/org/fbreader/optionsDialog/OptionsDialog.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java similarity index 91% rename from src/org/fbreader/optionsDialog/OptionsDialog.java rename to src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java index a51830622..a7990cd5d 100644 --- a/src/org/fbreader/optionsDialog/OptionsDialog.java +++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java @@ -1,15 +1,15 @@ -package org.fbreader.optionsDialog; -import org.fbreader.encoding.ZLEncodingCollection; -import org.fbreader.encodingOption.*; -import org.fbreader.fbreader.*; -import org.fbreader.formats.FormatPlugin.PluginCollection; -import org.zlibrary.core.dialogs.*; -import org.zlibrary.core.language.ZLLanguageList; -import org.zlibrary.core.optionEntries.*; -import org.zlibrary.core.options.*; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.view.ZLViewWidget; -import org.zlibrary.text.view.style.*; +package org.geometerplus.fbreader.optionsDialog; +import org.geometerplus.fbreader.encoding.ZLEncodingCollection; +import org.geometerplus.fbreader.encodingOption.*; +import org.geometerplus.fbreader.fbreader.*; +import org.geometerplus.fbreader.formats.FormatPlugin.PluginCollection; +import org.geometerplus.zlibrary.core.dialogs.*; +import org.geometerplus.zlibrary.core.language.ZLLanguageList; +import org.geometerplus.zlibrary.core.optionEntries.*; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.text.view.style.*; public class OptionsDialog { private ZLOptionsDialog myDialog; diff --git a/src/org/fbreader/optionsDialog/OptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java similarity index 81% rename from src/org/fbreader/optionsDialog/OptionsPage.java rename to src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java index f5242a4c9..769f3367f 100644 --- a/src/org/fbreader/optionsDialog/OptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java @@ -1,10 +1,10 @@ -package org.fbreader.optionsDialog; +package org.geometerplus.fbreader.optionsDialog; import java.util.HashMap; import java.util.LinkedHashMap; -import org.zlibrary.core.dialogs.ZLDialogContent; -import org.zlibrary.core.dialogs.ZLOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogContent; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; public class OptionsPage { private final LinkedHashMap /**/ myEntries = new LinkedHashMap(); diff --git a/src/org/fbreader/optionsDialog/ScrollingOptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/ScrollingOptionsPage.java similarity index 89% rename from src/org/fbreader/optionsDialog/ScrollingOptionsPage.java rename to src/org/geometerplus/fbreader/optionsDialog/ScrollingOptionsPage.java index cdd7f31f8..27539935a 100644 --- a/src/org/fbreader/optionsDialog/ScrollingOptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/ScrollingOptionsPage.java @@ -1,21 +1,21 @@ -package org.fbreader.optionsDialog; +package org.geometerplus.fbreader.optionsDialog; import java.util.ArrayList; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.fbreader.fbreader.FBReader; -import org.fbreader.fbreader.ScrollingOptions; -import org.zlibrary.core.dialogs.ZLBooleanOptionEntry; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; -import org.zlibrary.core.dialogs.ZLDialogContent; -import org.zlibrary.core.dialogs.ZLSpinOptionEntry; -import org.zlibrary.core.optionEntries.ZLSimpleBooleanOptionEntry; -import org.zlibrary.core.optionEntries.ZLSimpleSpinOptionEntry; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.text.view.ZLTextView; +import org.geometerplus.fbreader.fbreader.FBReader; +import org.geometerplus.fbreader.fbreader.ScrollingOptions; +import org.geometerplus.zlibrary.core.dialogs.ZLBooleanOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogContent; +import org.geometerplus.zlibrary.core.dialogs.ZLSpinOptionEntry; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBooleanOptionEntry; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleSpinOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.text.view.ZLTextView; public class ScrollingOptionsPage { private ScrollingEntries myLargeScrollingEntries; diff --git a/src/org/fbreader/optionsDialog/StyleOptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java similarity index 77% rename from src/org/fbreader/optionsDialog/StyleOptionsPage.java rename to src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java index e03334050..ef878e8f5 100644 --- a/src/org/fbreader/optionsDialog/StyleOptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java @@ -1,18 +1,18 @@ -package org.fbreader.optionsDialog; +package org.geometerplus.fbreader.optionsDialog; -import org.zlibrary.core.dialogs.ZLDialogContent; -import org.zlibrary.core.optionEntries.ZLFontFamilyOptionEntry; -import org.zlibrary.core.optionEntries.ZLSimpleBoolean3OptionEntry; -import org.zlibrary.core.optionEntries.ZLSimpleBooleanOptionEntry; -import org.zlibrary.core.optionEntries.ZLSimpleSpinOptionEntry; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.text.view.ZLTextFontFamilyWithBaseOptionEntry; -import org.zlibrary.text.view.style.ZLTextBaseStyle; -import org.zlibrary.text.view.style.ZLTextStyleCollection; -import org.zlibrary.text.view.style.ZLTextStyleDecoration; +import org.geometerplus.zlibrary.core.dialogs.ZLDialogContent; +import org.geometerplus.zlibrary.core.optionEntries.ZLFontFamilyOptionEntry; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBoolean3OptionEntry; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBooleanOptionEntry; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleSpinOptionEntry; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.text.view.ZLTextFontFamilyWithBaseOptionEntry; +import org.geometerplus.zlibrary.text.view.style.ZLTextBaseStyle; +import org.geometerplus.zlibrary.text.view.style.ZLTextStyleCollection; +import org.geometerplus.zlibrary.text.view.style.ZLTextStyleDecoration; -import static org.fbreader.bookmodel.FBTextKind.*; +import static org.geometerplus.fbreader.bookmodel.FBTextKind.*; public class StyleOptionsPage extends OptionsPage { private final static String KEY_STYLE = "style"; diff --git a/src/org/zlibrary/core/application/ZLApplication.java b/src/org/geometerplus/zlibrary/core/application/ZLApplication.java similarity index 91% rename from src/org/zlibrary/core/application/ZLApplication.java rename to src/org/geometerplus/zlibrary/core/application/ZLApplication.java index 92da01200..8f8735550 100644 --- a/src/org/zlibrary/core/application/ZLApplication.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLApplication.java @@ -1,19 +1,19 @@ -package org.zlibrary.core.application; +package org.geometerplus.zlibrary.core.application; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.core.view.ZLView; -import org.zlibrary.core.view.ZLViewWidget; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLReaderAdapter; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.core.view.ZLView; +import org.geometerplus.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; public abstract class ZLApplication { private static final String MouseScrollUpKey = ""; diff --git a/src/org/zlibrary/core/application/ZLApplicationWindow.java b/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java similarity index 96% rename from src/org/zlibrary/core/application/ZLApplicationWindow.java rename to src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java index 6e07639ba..4abb42b1f 100644 --- a/src/org/zlibrary/core/application/ZLApplicationWindow.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java @@ -1,9 +1,9 @@ -package org.zlibrary.core.application; +package org.geometerplus.zlibrary.core.application; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.view.ZLViewWidget; +import org.geometerplus.zlibrary.core.view.ZLViewWidget; abstract public class ZLApplicationWindow { private ZLApplication myApplication; diff --git a/src/org/zlibrary/core/application/ZLKeyBindings.java b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java similarity index 84% rename from src/org/zlibrary/core/application/ZLKeyBindings.java rename to src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java index a10d54890..ad740a20f 100644 --- a/src/org/zlibrary/core/application/ZLKeyBindings.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java @@ -1,14 +1,14 @@ -package org.zlibrary.core.application; +package org.geometerplus.zlibrary.core.application; import java.util.*; import java.util.Map.Entry; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.options.ZLStringOption; public final class ZLKeyBindings { private static final String BINDINGS_NUMBER = "Number"; diff --git a/src/org/zlibrary/core/application/ZLKeyBindingsReader.java b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java similarity index 66% rename from src/org/zlibrary/core/application/ZLKeyBindingsReader.java rename to src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java index b69214cec..b459d4fcd 100644 --- a/src/org/zlibrary/core/application/ZLKeyBindingsReader.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java @@ -1,11 +1,11 @@ -package org.zlibrary.core.application; +package org.geometerplus.zlibrary.core.application; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLReaderAdapter; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; class ZLKeyBindingsReader extends ZLXMLReaderAdapter { private HashMap myKeymap; diff --git a/src/org/zlibrary/core/config/ZLConfig.java b/src/org/geometerplus/zlibrary/core/config/ZLConfig.java similarity index 81% rename from src/org/zlibrary/core/config/ZLConfig.java rename to src/org/geometerplus/zlibrary/core/config/ZLConfig.java index 31e3693b6..fbeb30c07 100644 --- a/src/org/zlibrary/core/config/ZLConfig.java +++ b/src/org/geometerplus/zlibrary/core/config/ZLConfig.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.config; +package org.geometerplus.zlibrary.core.config; public interface ZLConfig { void removeGroup(String name); diff --git a/src/org/zlibrary/core/config/ZLConfigManager.java b/src/org/geometerplus/zlibrary/core/config/ZLConfigManager.java similarity index 93% rename from src/org/zlibrary/core/config/ZLConfigManager.java rename to src/org/geometerplus/zlibrary/core/config/ZLConfigManager.java index bf36de34a..2f06c26a9 100644 --- a/src/org/zlibrary/core/config/ZLConfigManager.java +++ b/src/org/geometerplus/zlibrary/core/config/ZLConfigManager.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.config; +package org.geometerplus.zlibrary.core.config; public abstract class ZLConfigManager { private static ZLConfigManager ourInstance; diff --git a/src/org/zlibrary/core/dialogs/UpdateType.java b/src/org/geometerplus/zlibrary/core/dialogs/UpdateType.java similarity index 77% rename from src/org/zlibrary/core/dialogs/UpdateType.java rename to src/org/geometerplus/zlibrary/core/dialogs/UpdateType.java index 74a0c4d02..6ddcd57c4 100644 --- a/src/org/zlibrary/core/dialogs/UpdateType.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/UpdateType.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public interface UpdateType { int UPDATE_NONE = 0; diff --git a/src/org/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java similarity index 82% rename from src/org/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java index e5461a20d..746d95b9f 100644 --- a/src/org/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLBoolean3OptionEntry extends ZLOptionEntry { protected ZLBoolean3OptionEntry() { diff --git a/src/org/zlibrary/core/dialogs/ZLBooleanOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLBooleanOptionEntry.java similarity index 83% rename from src/org/zlibrary/core/dialogs/ZLBooleanOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLBooleanOptionEntry.java index d6252fce6..427c5d877 100644 --- a/src/org/zlibrary/core/dialogs/ZLBooleanOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLBooleanOptionEntry.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLBooleanOptionEntry extends ZLOptionEntry { protected ZLBooleanOptionEntry() { diff --git a/src/org/zlibrary/core/dialogs/ZLChoiceOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLChoiceOptionEntry.java similarity index 83% rename from src/org/zlibrary/core/dialogs/ZLChoiceOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLChoiceOptionEntry.java index e63b80f2d..21184289e 100644 --- a/src/org/zlibrary/core/dialogs/ZLChoiceOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLChoiceOptionEntry.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLChoiceOptionEntry extends ZLOptionEntry { protected ZLChoiceOptionEntry() {} diff --git a/src/org/zlibrary/core/dialogs/ZLColorOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLColorOptionEntry.java similarity index 73% rename from src/org/zlibrary/core/dialogs/ZLColorOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLColorOptionEntry.java index 2ad4b7140..cbac74ecb 100644 --- a/src/org/zlibrary/core/dialogs/ZLColorOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLColorOptionEntry.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; -import org.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.util.ZLColor; public abstract class ZLColorOptionEntry extends ZLOptionEntry { protected ZLColorOptionEntry() {} diff --git a/src/org/zlibrary/core/dialogs/ZLComboOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java similarity index 85% rename from src/org/zlibrary/core/dialogs/ZLComboOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java index 743f50e09..3931ebab9 100644 --- a/src/org/zlibrary/core/dialogs/ZLComboOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public abstract class ZLComboOptionEntry extends ZLOptionEntry { private final boolean myEditable; diff --git a/src/org/zlibrary/core/dialogs/ZLDialog.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialog.java similarity index 78% rename from src/org/zlibrary/core/dialogs/ZLDialog.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLDialog.java index a602d9e61..b1725ce71 100644 --- a/src/org/zlibrary/core/dialogs/ZLDialog.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialog.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.options.ZLSimpleOption; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.options.ZLSimpleOption; public abstract class ZLDialog { protected ZLDialogContent myTab; diff --git a/src/org/zlibrary/core/dialogs/ZLDialogContent.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java similarity index 81% rename from src/org/zlibrary/core/dialogs/ZLDialogContent.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java index 5b87041a9..263f4ce3c 100644 --- a/src/org/zlibrary/core/dialogs/ZLDialogContent.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java @@ -1,14 +1,14 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.optionEntries.ZLSimpleBoolean3OptionEntry; -import org.zlibrary.core.optionEntries.ZLSimpleBooleanOptionEntry; -import org.zlibrary.core.optionEntries.ZLSimpleStringOptionEntry; -import org.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBoolean3OptionEntry; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleBooleanOptionEntry; +import org.geometerplus.zlibrary.core.optionEntries.ZLSimpleStringOptionEntry; +import org.geometerplus.zlibrary.core.options.*; public abstract class ZLDialogContent { private final ZLResource myResource; diff --git a/src/org/zlibrary/core/dialogs/ZLDialogManager.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java similarity index 89% rename from src/org/zlibrary/core/dialogs/ZLDialogManager.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java index 4836dcb8d..aced168df 100644 --- a/src/org/zlibrary/core/dialogs/ZLDialogManager.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java @@ -1,8 +1,8 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.application.ZLApplicationWindow; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.application.ZLApplicationWindow; +import org.geometerplus.zlibrary.core.resources.ZLResource; public abstract class ZLDialogManager { protected static ZLDialogManager ourInstance; diff --git a/src/org/zlibrary/core/dialogs/ZLKeyOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java similarity index 83% rename from src/org/zlibrary/core/dialogs/ZLKeyOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java index 8dedf563f..3724255b2 100644 --- a/src/org/zlibrary/core/dialogs/ZLKeyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public abstract class ZLKeyOptionEntry extends ZLOptionEntry { private final ArrayList/**/ myActionNames = new ArrayList(); diff --git a/src/org/zlibrary/core/dialogs/ZLMultilineOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLMultilineOptionEntry.java similarity index 75% rename from src/org/zlibrary/core/dialogs/ZLMultilineOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLMultilineOptionEntry.java index 98af680ea..1ec9bd91a 100644 --- a/src/org/zlibrary/core/dialogs/ZLMultilineOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLMultilineOptionEntry.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLMultilineOptionEntry extends ZLTextOptionEntry { protected ZLMultilineOptionEntry() {} diff --git a/src/org/zlibrary/core/dialogs/ZLOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionEntry.java similarity index 89% rename from src/org/zlibrary/core/dialogs/ZLOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLOptionEntry.java index 2d01d4fac..70dcc2434 100644 --- a/src/org/zlibrary/core/dialogs/ZLOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionEntry.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLOptionEntry { private ZLOptionView myView; diff --git a/src/org/zlibrary/core/dialogs/ZLOptionKind.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionKind.java similarity index 76% rename from src/org/zlibrary/core/dialogs/ZLOptionKind.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLOptionKind.java index 59872bb3e..95887a9d1 100644 --- a/src/org/zlibrary/core/dialogs/ZLOptionKind.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionKind.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public interface ZLOptionKind { int CHOICE = 0; diff --git a/src/org/zlibrary/core/dialogs/ZLOptionView.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionView.java similarity index 90% rename from src/org/zlibrary/core/dialogs/ZLOptionView.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLOptionView.java index 02beb8c59..8b2fb30e4 100644 --- a/src/org/zlibrary/core/dialogs/ZLOptionView.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionView.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLOptionView { protected final String myName; diff --git a/src/org/zlibrary/core/dialogs/ZLOptionsDialog.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java similarity index 83% rename from src/org/zlibrary/core/dialogs/ZLOptionsDialog.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java index 0d4d91adf..683999bfa 100644 --- a/src/org/zlibrary/core/dialogs/ZLOptionsDialog.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java @@ -1,11 +1,11 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.options.ZLOption; -import org.zlibrary.core.options.ZLStringOption; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.options.ZLOption; +import org.geometerplus.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.resources.ZLResource; public abstract class ZLOptionsDialog { private final ZLResource myResource; diff --git a/src/org/zlibrary/core/dialogs/ZLOrderOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java similarity index 72% rename from src/org/zlibrary/core/dialogs/ZLOrderOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java index da20fabc0..d465f2525 100644 --- a/src/org/zlibrary/core/dialogs/ZLOrderOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public abstract class ZLOrderOptionEntry extends ZLOptionEntry { private final ArrayList/**/ myValues = new ArrayList(); diff --git a/src/org/zlibrary/core/dialogs/ZLSelectionDialog.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLSelectionDialog.java similarity index 90% rename from src/org/zlibrary/core/dialogs/ZLSelectionDialog.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLSelectionDialog.java index eed99b005..ae8b40a6b 100644 --- a/src/org/zlibrary/core/dialogs/ZLSelectionDialog.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLSelectionDialog.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public abstract class ZLSelectionDialog { private final ZLTreeHandler myHandler; diff --git a/src/org/zlibrary/core/dialogs/ZLSpinOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLSpinOptionEntry.java similarity index 83% rename from src/org/zlibrary/core/dialogs/ZLSpinOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLSpinOptionEntry.java index ecc2f70bb..30c9770ed 100644 --- a/src/org/zlibrary/core/dialogs/ZLSpinOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLSpinOptionEntry.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLSpinOptionEntry extends ZLOptionEntry { protected ZLSpinOptionEntry() {} diff --git a/src/org/zlibrary/core/dialogs/ZLStringOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLStringOptionEntry.java similarity index 74% rename from src/org/zlibrary/core/dialogs/ZLStringOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLStringOptionEntry.java index 0e746a33d..bdc0e3a61 100644 --- a/src/org/zlibrary/core/dialogs/ZLStringOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLStringOptionEntry.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLStringOptionEntry extends ZLTextOptionEntry { protected ZLStringOptionEntry() { diff --git a/src/org/zlibrary/core/dialogs/ZLTextOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLTextOptionEntry.java similarity index 80% rename from src/org/zlibrary/core/dialogs/ZLTextOptionEntry.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLTextOptionEntry.java index 465cf8547..6eb0ebda1 100644 --- a/src/org/zlibrary/core/dialogs/ZLTextOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLTextOptionEntry.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLTextOptionEntry extends ZLOptionEntry { public abstract String initialValue(); diff --git a/src/org/zlibrary/core/dialogs/ZLTreeHandler.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLTreeHandler.java similarity index 86% rename from src/org/zlibrary/core/dialogs/ZLTreeHandler.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLTreeHandler.java index 278fb9228..591eb0751 100644 --- a/src/org/zlibrary/core/dialogs/ZLTreeHandler.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLTreeHandler.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public abstract class ZLTreeHandler { private int myUpdateInfo; diff --git a/src/org/zlibrary/core/dialogs/ZLTreeNode.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLTreeNode.java similarity index 88% rename from src/org/zlibrary/core/dialogs/ZLTreeNode.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLTreeNode.java index e4f6f19fb..98568f34f 100644 --- a/src/org/zlibrary/core/dialogs/ZLTreeNode.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLTreeNode.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public class ZLTreeNode { private final String myId; diff --git a/src/org/zlibrary/core/dialogs/ZLTreeOpenHandler.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLTreeOpenHandler.java similarity index 75% rename from src/org/zlibrary/core/dialogs/ZLTreeOpenHandler.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLTreeOpenHandler.java index 8ad4aee8a..e838ba3c4 100644 --- a/src/org/zlibrary/core/dialogs/ZLTreeOpenHandler.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLTreeOpenHandler.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLTreeOpenHandler extends ZLTreeHandler { public boolean isOpenHandler() { diff --git a/src/org/zlibrary/core/dialogs/ZLTreeSaveHandler.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLTreeSaveHandler.java similarity index 79% rename from src/org/zlibrary/core/dialogs/ZLTreeSaveHandler.java rename to src/org/geometerplus/zlibrary/core/dialogs/ZLTreeSaveHandler.java index 084aa90e2..b023d708d 100644 --- a/src/org/zlibrary/core/dialogs/ZLTreeSaveHandler.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLTreeSaveHandler.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.dialogs; +package org.geometerplus.zlibrary.core.dialogs; public abstract class ZLTreeSaveHandler extends ZLTreeHandler { public boolean isOpenHandler() { diff --git a/src/org/zlibrary/core/filesystem/ZLDir.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLDir.java similarity index 89% rename from src/org/zlibrary/core/filesystem/ZLDir.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLDir.java index afff74796..3c40dd9ff 100644 --- a/src/org/zlibrary/core/filesystem/ZLDir.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLDir.java @@ -1,8 +1,8 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; import java.io.*; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public abstract class ZLDir { protected String myPath; diff --git a/src/org/zlibrary/core/filesystem/ZLFSDir.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLFSDir.java similarity index 86% rename from src/org/zlibrary/core/filesystem/ZLFSDir.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLFSDir.java index 0daa2feea..e3ac25895 100644 --- a/src/org/zlibrary/core/filesystem/ZLFSDir.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLFSDir.java @@ -1,11 +1,11 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; import java.io.*; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.library.ZLibrary; class ZLFSDir extends ZLDir { private File myFile; diff --git a/src/org/zlibrary/core/filesystem/ZLFSUtil.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLFSUtil.java similarity index 86% rename from src/org/zlibrary/core/filesystem/ZLFSUtil.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLFSUtil.java index c8e8ba99b..721ca6813 100644 --- a/src/org/zlibrary/core/filesystem/ZLFSUtil.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLFSUtil.java @@ -1,10 +1,10 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; import java.io.*; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.library.ZLibrary; abstract class ZLFSUtil { static String normalize(String path) { diff --git a/src/org/zlibrary/core/filesystem/ZLFile.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java similarity index 94% rename from src/org/zlibrary/core/filesystem/ZLFile.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java index bc20998c1..9cf4b25e9 100644 --- a/src/org/zlibrary/core/filesystem/ZLFile.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java @@ -1,11 +1,11 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; import java.io.*; import java.util.*; import java.util.zip.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.library.ZLibrary; public class ZLFile { public class ArchiveType { diff --git a/src/org/zlibrary/core/filesystem/ZLFileInfo.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLFileInfo.java similarity index 65% rename from src/org/zlibrary/core/filesystem/ZLFileInfo.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLFileInfo.java index 879018600..320084414 100644 --- a/src/org/zlibrary/core/filesystem/ZLFileInfo.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLFileInfo.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; class ZLFileInfo { public boolean Exists; diff --git a/src/org/zlibrary/core/filesystem/ZLTarDir.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarDir.java similarity index 94% rename from src/org/zlibrary/core/filesystem/ZLTarDir.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLTarDir.java index 69182e8da..be0d3cb49 100644 --- a/src/org/zlibrary/core/filesystem/ZLTarDir.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarDir.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; import java.util.ArrayList; import java.io.InputStream; diff --git a/src/org/zlibrary/core/filesystem/ZLTarHeader.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarHeader.java similarity index 96% rename from src/org/zlibrary/core/filesystem/ZLTarHeader.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLTarHeader.java index 87337e84a..04eb05a83 100644 --- a/src/org/zlibrary/core/filesystem/ZLTarHeader.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarHeader.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; import java.io.InputStream; import java.io.IOException; diff --git a/src/org/zlibrary/core/filesystem/ZLTarInputStream.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarInputStream.java similarity index 95% rename from src/org/zlibrary/core/filesystem/ZLTarInputStream.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLTarInputStream.java index a128cc6ce..b1fb55977 100644 --- a/src/org/zlibrary/core/filesystem/ZLTarInputStream.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarInputStream.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; import java.io.InputStream; import java.io.IOException; diff --git a/src/org/zlibrary/core/filesystem/ZLZipDir.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLZipDir.java similarity index 87% rename from src/org/zlibrary/core/filesystem/ZLZipDir.java rename to src/org/geometerplus/zlibrary/core/filesystem/ZLZipDir.java index 9897c9800..a9c5a1da2 100644 --- a/src/org/zlibrary/core/filesystem/ZLZipDir.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLZipDir.java @@ -1,9 +1,9 @@ -package org.zlibrary.core.filesystem; +package org.geometerplus.zlibrary.core.filesystem; import java.io.*; import java.util.*; import java.util.zip.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public class ZLZipDir extends ZLDir { private File myFile; diff --git a/src/org/zlibrary/core/html/ZLHtmlProcessor.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessor.java similarity index 80% rename from src/org/zlibrary/core/html/ZLHtmlProcessor.java rename to src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessor.java index 86c29112c..cc02df9be 100644 --- a/src/org/zlibrary/core/html/ZLHtmlProcessor.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessor.java @@ -1,8 +1,8 @@ -package org.zlibrary.core.html; +package org.geometerplus.zlibrary.core.html; import java.io.*; -import org.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.library.ZLibrary; public abstract class ZLHtmlProcessor { public abstract boolean read(ZLHtmlReader xmlReader, InputStream stream); diff --git a/src/org/zlibrary/core/html/ZLHtmlProcessorFactory.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessorFactory.java similarity index 83% rename from src/org/zlibrary/core/html/ZLHtmlProcessorFactory.java rename to src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessorFactory.java index 44e22d884..2ab54a056 100644 --- a/src/org/zlibrary/core/html/ZLHtmlProcessorFactory.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessorFactory.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.html; +package org.geometerplus.zlibrary.core.html; public abstract class ZLHtmlProcessorFactory { private static ZLHtmlProcessorFactory ourInstance; diff --git a/src/org/zlibrary/core/html/ZLHtmlReader.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlReader.java similarity index 78% rename from src/org/zlibrary/core/html/ZLHtmlReader.java rename to src/org/geometerplus/zlibrary/core/html/ZLHtmlReader.java index 528d5cdbd..a7d0a8a19 100644 --- a/src/org/zlibrary/core/html/ZLHtmlReader.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlReader.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.html; +package org.geometerplus.zlibrary.core.html; -import org.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; public interface ZLHtmlReader { public boolean dontCacheAttributeValues(); diff --git a/src/org/zlibrary/core/html/ZLHtmlReaderAdapter.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlReaderAdapter.java similarity index 86% rename from src/org/zlibrary/core/html/ZLHtmlReaderAdapter.java rename to src/org/geometerplus/zlibrary/core/html/ZLHtmlReaderAdapter.java index dee10f695..5f37d96fa 100644 --- a/src/org/zlibrary/core/html/ZLHtmlReaderAdapter.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlReaderAdapter.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.html; +package org.geometerplus.zlibrary.core.html; -import org.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; public class ZLHtmlReaderAdapter implements ZLHtmlReader { public boolean read(String fileName) { diff --git a/src/org/zlibrary/core/html/own/ZLMutableString.java b/src/org/geometerplus/zlibrary/core/html/own/ZLMutableString.java similarity index 93% rename from src/org/zlibrary/core/html/own/ZLMutableString.java rename to src/org/geometerplus/zlibrary/core/html/own/ZLMutableString.java index 73f02f0ad..f71789dc8 100644 --- a/src/org/zlibrary/core/html/own/ZLMutableString.java +++ b/src/org/geometerplus/zlibrary/core/html/own/ZLMutableString.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.html.own; +package org.geometerplus.zlibrary.core.html.own; -import org.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; final class ZLMutableString { private char[] myData; diff --git a/src/org/zlibrary/core/html/own/ZLOwnHtmlParser.java b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlParser.java similarity index 98% rename from src/org/zlibrary/core/html/own/ZLOwnHtmlParser.java rename to src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlParser.java index 86578b23f..a3d007a1d 100644 --- a/src/org/zlibrary/core/html/own/ZLOwnHtmlParser.java +++ b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlParser.java @@ -1,15 +1,15 @@ -package org.zlibrary.core.html.own; +package org.geometerplus.zlibrary.core.html.own; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.util.ZLArrayUtils; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.html.ZLHtmlReader; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.html.ZLHtmlReader; final class ZLOwnHtmlParser { private static final byte START_DOCUMENT = 0; diff --git a/src/org/zlibrary/core/html/own/ZLOwnHtmlProcessor.java b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessor.java similarity index 70% rename from src/org/zlibrary/core/html/own/ZLOwnHtmlProcessor.java rename to src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessor.java index 04e53c1f0..87abd5dfe 100644 --- a/src/org/zlibrary/core/html/own/ZLOwnHtmlProcessor.java +++ b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessor.java @@ -1,10 +1,10 @@ -package org.zlibrary.core.html.own; +package org.geometerplus.zlibrary.core.html.own; import java.io.InputStream; import java.io.IOException; -import org.zlibrary.core.html.ZLHtmlProcessor; -import org.zlibrary.core.html.ZLHtmlReader; +import org.geometerplus.zlibrary.core.html.ZLHtmlProcessor; +import org.geometerplus.zlibrary.core.html.ZLHtmlReader; public class ZLOwnHtmlProcessor extends ZLHtmlProcessor { public boolean read(ZLHtmlReader reader, InputStream stream) { diff --git a/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java new file mode 100644 index 000000000..66b426462 --- /dev/null +++ b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java @@ -0,0 +1,10 @@ +package org.geometerplus.zlibrary.core.html.own; + +import org.geometerplus.zlibrary.core.html.ZLHtmlProcessor; +import org.geometerplus.zlibrary.core.html.ZLHtmlProcessorFactory; + +public class ZLOwnHtmlProcessorFactory extends ZLHtmlProcessorFactory { + public ZLHtmlProcessor createHtmlProcessor() { + return new ZLOwnHtmlProcessor(); + } +} diff --git a/src/org/geometerplus/zlibrary/core/html/own/test/Main.java b/src/org/geometerplus/zlibrary/core/html/own/test/Main.java new file mode 100644 index 000000000..c68d60bb1 --- /dev/null +++ b/src/org/geometerplus/zlibrary/core/html/own/test/Main.java @@ -0,0 +1,21 @@ +package org.geometerplus.zlibrary.core.html.own.test; + + +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.html.ZLHtmlReaderAdapter; +import org.geometerplus.zlibrary.core.html.own.ZLOwnHtmlProcessorFactory; + +public class Main { + + private static ZLHtmlReaderAdapter myReader = new MyHtmlReader(); + + /** + * @param args + */ + public static void main(String[] args) { + // TODO Auto-generated method stub + new ZLOwnHtmlProcessorFactory(); + //myReader.read("src/org.geometerplus.zlibrary/core/html/own/test/test.html"); + myReader.read("src/org.geometerplus.zlibrary/core/html/own/test/subversion.htm"); + } +} diff --git a/src/org/zlibrary/core/html/own/test/MyHtmlReader.java b/src/org/geometerplus/zlibrary/core/html/own/test/MyHtmlReader.java similarity index 80% rename from src/org/zlibrary/core/html/own/test/MyHtmlReader.java rename to src/org/geometerplus/zlibrary/core/html/own/test/MyHtmlReader.java index 6ce6b8e45..f0d678f23 100644 --- a/src/org/zlibrary/core/html/own/test/MyHtmlReader.java +++ b/src/org/geometerplus/zlibrary/core/html/own/test/MyHtmlReader.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.html.own.test; +package org.geometerplus.zlibrary.core.html.own.test; -import org.zlibrary.core.html.ZLHtmlReaderAdapter; -import org.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.html.ZLHtmlReaderAdapter; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; public class MyHtmlReader extends ZLHtmlReaderAdapter { diff --git a/src/org/zlibrary/core/html/own/test/sub2.html b/src/org/geometerplus/zlibrary/core/html/own/test/sub2.html similarity index 100% rename from src/org/zlibrary/core/html/own/test/sub2.html rename to src/org/geometerplus/zlibrary/core/html/own/test/sub2.html diff --git a/src/org/zlibrary/core/html/own/test/subversion.htm b/src/org/geometerplus/zlibrary/core/html/own/test/subversion.htm similarity index 100% rename from src/org/zlibrary/core/html/own/test/subversion.htm rename to src/org/geometerplus/zlibrary/core/html/own/test/subversion.htm diff --git a/src/org/zlibrary/core/html/own/test/test.html b/src/org/geometerplus/zlibrary/core/html/own/test/test.html similarity index 100% rename from src/org/zlibrary/core/html/own/test/test.html rename to src/org/geometerplus/zlibrary/core/html/own/test/test.html diff --git a/src/org/zlibrary/core/image/ZLFileImage.java b/src/org/geometerplus/zlibrary/core/image/ZLFileImage.java similarity index 87% rename from src/org/zlibrary/core/image/ZLFileImage.java rename to src/org/geometerplus/zlibrary/core/image/ZLFileImage.java index a73fdbbe6..c5b0f9341 100644 --- a/src/org/zlibrary/core/image/ZLFileImage.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLFileImage.java @@ -1,9 +1,9 @@ -package org.zlibrary.core.image; +package org.geometerplus.zlibrary.core.image; import java.io.*; import java.util.*; -import org.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.library.ZLibrary; public class ZLFileImage implements ZLImage { public ZLFileImage(String mimeType, String path, int offset) { diff --git a/src/org/zlibrary/core/image/ZLImage.java b/src/org/geometerplus/zlibrary/core/image/ZLImage.java similarity index 52% rename from src/org/zlibrary/core/image/ZLImage.java rename to src/org/geometerplus/zlibrary/core/image/ZLImage.java index 528c367c6..30ef34b2c 100644 --- a/src/org/zlibrary/core/image/ZLImage.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLImage.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.image; +package org.geometerplus.zlibrary.core.image; //TODO public interface ZLImage { byte [] byteData(); diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageData.java b/src/org/geometerplus/zlibrary/core/image/ZLImageData.java new file mode 100644 index 000000000..64eb05e3d --- /dev/null +++ b/src/org/geometerplus/zlibrary/core/image/ZLImageData.java @@ -0,0 +1,4 @@ +package org.geometerplus.zlibrary.core.image; + +public interface ZLImageData { +} diff --git a/src/org/zlibrary/core/image/ZLImageManager.java b/src/org/geometerplus/zlibrary/core/image/ZLImageManager.java similarity index 85% rename from src/org/zlibrary/core/image/ZLImageManager.java rename to src/org/geometerplus/zlibrary/core/image/ZLImageManager.java index e6b2680a8..1bd9b2ca8 100644 --- a/src/org/zlibrary/core/image/ZLImageManager.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLImageManager.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.image; +package org.geometerplus.zlibrary.core.image; public abstract class ZLImageManager { private static ZLImageManager ourInstance; diff --git a/src/org/zlibrary/core/image/ZLImageMap.java b/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java similarity index 61% rename from src/org/zlibrary/core/image/ZLImageMap.java rename to src/org/geometerplus/zlibrary/core/image/ZLImageMap.java index 4e87e96c1..ba85bff4b 100644 --- a/src/org/zlibrary/core/image/ZLImageMap.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.image; +package org.geometerplus.zlibrary.core.image; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public final class ZLImageMap extends HashMap { public ZLImage getImage(String id) { diff --git a/src/org/zlibrary/core/language/ZLLanguageDetector.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java similarity index 91% rename from src/org/zlibrary/core/language/ZLLanguageDetector.java rename to src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java index 9363d435a..4b328da24 100644 --- a/src/org/zlibrary/core/language/ZLLanguageDetector.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java @@ -1,12 +1,12 @@ -package org.zlibrary.core.language; +package org.geometerplus.zlibrary.core.language; import java.util.ArrayList; import java.util.Iterator; -import org.zlibrary.core.filesystem.ZLDir; -import org.zlibrary.core.language.ZLLanguageMatcher.ZLLanguagePatternBasedMatcher; -import org.zlibrary.core.language.ZLLanguageMatcher.ZLWordBasedMatcher; -import org.zlibrary.core.util.ZLUnicodeUtil; +import org.geometerplus.zlibrary.core.filesystem.ZLDir; +import org.geometerplus.zlibrary.core.language.ZLLanguageMatcher.ZLLanguagePatternBasedMatcher; +import org.geometerplus.zlibrary.core.language.ZLLanguageMatcher.ZLWordBasedMatcher; +import org.geometerplus.zlibrary.core.util.ZLUnicodeUtil; public class ZLLanguageDetector { // 0: no break diff --git a/src/org/zlibrary/core/language/ZLLanguageList.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java similarity index 77% rename from src/org/zlibrary/core/language/ZLLanguageList.java rename to src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java index 554e58737..85f38f200 100644 --- a/src/org/zlibrary/core/language/ZLLanguageList.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java @@ -1,13 +1,13 @@ -package org.zlibrary.core.language; +package org.geometerplus.zlibrary.core.language; import java.io.File; import java.util.ArrayList; import java.util.TreeSet; -import org.zlibrary.core.filesystem.ZLDir; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.filesystem.ZLDir; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.resources.ZLResource; public class ZLLanguageList { private static ArrayList ourLanguageCodes = new ArrayList(); diff --git a/src/org/zlibrary/core/language/ZLLanguageMatcher.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java similarity index 91% rename from src/org/zlibrary/core/language/ZLLanguageMatcher.java rename to src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java index 32fb19448..34a208d69 100644 --- a/src/org/zlibrary/core/language/ZLLanguageMatcher.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java @@ -1,10 +1,10 @@ -package org.zlibrary.core.language; +package org.geometerplus.zlibrary.core.language; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import org.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; public abstract class ZLLanguageMatcher { diff --git a/src/org/zlibrary/core/library/ZLibrary.java b/src/org/geometerplus/zlibrary/core/library/ZLibrary.java similarity index 85% rename from src/org/zlibrary/core/library/ZLibrary.java rename to src/org/geometerplus/zlibrary/core/library/ZLibrary.java index 9d5805855..d1ef87d7c 100644 --- a/src/org/zlibrary/core/library/ZLibrary.java +++ b/src/org/geometerplus/zlibrary/core/library/ZLibrary.java @@ -1,13 +1,13 @@ -package org.zlibrary.core.library; +package org.geometerplus.zlibrary.core.library; import java.io.File; import java.io.InputStream; import java.util.HashMap; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLReaderAdapter; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; public abstract class ZLibrary { public static final String JAR_DATA_PREFIX = "#JAR#://"; diff --git a/src/org/zlibrary/core/optionEntries/ZLColorOptionBuilder.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java similarity index 86% rename from src/org/zlibrary/core/optionEntries/ZLColorOptionBuilder.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java index 730a7046a..3f6992311 100644 --- a/src/org/zlibrary/core/optionEntries/ZLColorOptionBuilder.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java @@ -1,14 +1,14 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; import java.util.ArrayList; import java.util.HashMap; -import org.zlibrary.core.options.ZLColorOption; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.options.ZLColorOption; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.dialogs.ZLColorOptionEntry; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; -import org.zlibrary.core.dialogs.ZLOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLColorOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; public class ZLColorOptionBuilder { private ZLColorOptionsData myData; diff --git a/src/org/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java similarity index 70% rename from src/org/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java index 550eaa118..1d23bb547 100644 --- a/src/org/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java @@ -1,10 +1,10 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; import java.util.ArrayList; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; -import org.zlibrary.core.options.ZLStringOption; -import org.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; public class ZLFontFamilyOptionEntry extends ZLComboOptionEntry { private ZLStringOption myOption; diff --git a/src/org/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java similarity index 79% rename from src/org/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java index e1cee9adf..7771851f9 100644 --- a/src/org/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java @@ -1,13 +1,13 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; -import org.zlibrary.core.language.ZLLanguageList; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.language.ZLLanguageList; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.options.ZLStringOption; public class ZLLanguageOptionEntry extends ZLComboOptionEntry { public ZLLanguageOptionEntry(ZLStringOption languageOption, ArrayList/**/ languageCodes) { diff --git a/src/org/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java similarity index 50% rename from src/org/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java index 7b0da2011..b8d84a363 100644 --- a/src/org/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java @@ -1,9 +1,9 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; -import org.zlibrary.core.dialogs.ZLBoolean3OptionEntry; -import org.zlibrary.core.options.ZLBoolean3Option; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.util.ZLBoolean3; +import org.geometerplus.zlibrary.core.dialogs.ZLBoolean3OptionEntry; +import org.geometerplus.zlibrary.core.options.ZLBoolean3Option; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.util.ZLBoolean3; public class ZLSimpleBoolean3OptionEntry extends ZLBoolean3OptionEntry { private ZLBoolean3Option myOption; diff --git a/src/org/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java similarity index 62% rename from src/org/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java index 62707a178..e5b088036 100644 --- a/src/org/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; -import org.zlibrary.core.dialogs.ZLBooleanOptionEntry; -import org.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.dialogs.ZLBooleanOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; public class ZLSimpleBooleanOptionEntry extends ZLBooleanOptionEntry { private ZLBooleanOption myOption; diff --git a/src/org/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java similarity index 82% rename from src/org/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java index 5423520ca..5ba2db365 100644 --- a/src/org/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java @@ -1,14 +1,14 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.application.ZLKeyBindings; -import org.zlibrary.core.dialogs.ZLKeyOptionEntry; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.application.ZLKeyBindings; +import org.geometerplus.zlibrary.core.dialogs.ZLKeyOptionEntry; +import org.geometerplus.zlibrary.core.util.*; public abstract class ZLSimpleKeyOptionEntry extends ZLKeyOptionEntry { private ZLKeyBindings myBindings; diff --git a/src/org/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java similarity index 71% rename from src/org/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java index bee39ef4b..25bbaae34 100644 --- a/src/org/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; -import org.zlibrary.core.dialogs.ZLSpinOptionEntry; -import org.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.dialogs.ZLSpinOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; public class ZLSimpleSpinOptionEntry extends ZLSpinOptionEntry { private int myStep; diff --git a/src/org/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java similarity index 61% rename from src/org/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java index 32317c9cb..f79a56a9f 100644 --- a/src/org/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; -import org.zlibrary.core.dialogs.ZLStringOptionEntry; -import org.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.dialogs.ZLStringOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLStringOption; public class ZLSimpleStringOptionEntry extends ZLStringOptionEntry { private ZLStringOption myOption; diff --git a/src/org/zlibrary/core/optionEntries/ZLStringInfoEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLStringInfoEntry.java similarity index 71% rename from src/org/zlibrary/core/optionEntries/ZLStringInfoEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLStringInfoEntry.java index 9fcddf843..52affe4ef 100644 --- a/src/org/zlibrary/core/optionEntries/ZLStringInfoEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLStringInfoEntry.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; -import org.zlibrary.core.dialogs.ZLStringOptionEntry; +import org.geometerplus.zlibrary.core.dialogs.ZLStringOptionEntry; public class ZLStringInfoEntry extends ZLStringOptionEntry { private String myValue; diff --git a/src/org/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java similarity index 71% rename from src/org/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java rename to src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java index 9f5833ba8..7f27d8226 100644 --- a/src/org/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java @@ -1,10 +1,10 @@ -package org.zlibrary.core.optionEntries; +package org.geometerplus.zlibrary.core.optionEntries; import java.util.ArrayList; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.dialogs.ZLOptionEntry; -import org.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.dialogs.ZLOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; public class ZLToggleBooleanOptionEntry extends ZLSimpleBooleanOptionEntry { private final ArrayList/**/ myDependentEntries = new ArrayList(); diff --git a/src/org/zlibrary/core/options/ZLBoolean3Option.java b/src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java similarity index 85% rename from src/org/zlibrary/core/options/ZLBoolean3Option.java rename to src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java index 79f87a5ce..13144d638 100644 --- a/src/org/zlibrary/core/options/ZLBoolean3Option.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.options; +package org.geometerplus.zlibrary.core.options; -import org.zlibrary.core.util.ZLBoolean3; +import org.geometerplus.zlibrary.core.util.ZLBoolean3; public final class ZLBoolean3Option extends ZLOption implements ZLSimpleOption { private int myValue; diff --git a/src/org/zlibrary/core/options/ZLBooleanOption.java b/src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java similarity index 91% rename from src/org/zlibrary/core/options/ZLBooleanOption.java rename to src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java index 005195f0a..17d1113fd 100644 --- a/src/org/zlibrary/core/options/ZLBooleanOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.options; +package org.geometerplus.zlibrary.core.options; public final class ZLBooleanOption extends ZLOption implements ZLSimpleOption { private final boolean myDefaultValue; diff --git a/src/org/zlibrary/core/options/ZLColorOption.java b/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java similarity index 90% rename from src/org/zlibrary/core/options/ZLColorOption.java rename to src/org/geometerplus/zlibrary/core/options/ZLColorOption.java index a0a52099a..ad149fa7f 100644 --- a/src/org/zlibrary/core/options/ZLColorOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.options; +package org.geometerplus.zlibrary.core.options; -import org.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.util.ZLColor; /** * класс опция цвета. внутри опции цвет хранится одним числом, чтобы уменьшить diff --git a/src/org/zlibrary/core/options/ZLIntegerOption.java b/src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java similarity index 91% rename from src/org/zlibrary/core/options/ZLIntegerOption.java rename to src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java index 6ad8941a6..d901914d5 100644 --- a/src/org/zlibrary/core/options/ZLIntegerOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.options; +package org.geometerplus.zlibrary.core.options; /** * класс целочисленная опция. diff --git a/src/org/zlibrary/core/options/ZLIntegerRangeOption.java b/src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java similarity index 93% rename from src/org/zlibrary/core/options/ZLIntegerRangeOption.java rename to src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java index f190127dc..403eb5849 100644 --- a/src/org/zlibrary/core/options/ZLIntegerRangeOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.options; +package org.geometerplus.zlibrary.core.options; /** * класс ранжированная целочисленная опция. есть верхний и нижний пределы, diff --git a/src/org/zlibrary/core/options/ZLOption.java b/src/org/geometerplus/zlibrary/core/options/ZLOption.java similarity index 88% rename from src/org/zlibrary/core/options/ZLOption.java rename to src/org/geometerplus/zlibrary/core/options/ZLOption.java index 6c56600b9..894422146 100644 --- a/src/org/zlibrary/core/options/ZLOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLOption.java @@ -1,7 +1,7 @@ -package org.zlibrary.core.options; +package org.geometerplus.zlibrary.core.options; -import org.zlibrary.core.config.ZLConfig; -import org.zlibrary.core.config.ZLConfigManager; +import org.geometerplus.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.config.ZLConfigManager; public abstract class ZLOption { public static final String LOOK_AND_FEEL_CATEGORY = "ui"; diff --git a/src/org/zlibrary/core/options/ZLSimpleOption.java b/src/org/geometerplus/zlibrary/core/options/ZLSimpleOption.java similarity index 70% rename from src/org/zlibrary/core/options/ZLSimpleOption.java rename to src/org/geometerplus/zlibrary/core/options/ZLSimpleOption.java index c060fbf29..ed2caec20 100644 --- a/src/org/zlibrary/core/options/ZLSimpleOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLSimpleOption.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.options; +package org.geometerplus.zlibrary.core.options; public interface ZLSimpleOption { public interface Type { diff --git a/src/org/zlibrary/core/options/ZLStringOption.java b/src/org/geometerplus/zlibrary/core/options/ZLStringOption.java similarity index 91% rename from src/org/zlibrary/core/options/ZLStringOption.java rename to src/org/geometerplus/zlibrary/core/options/ZLStringOption.java index db3035207..e77cfe75e 100644 --- a/src/org/zlibrary/core/options/ZLStringOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLStringOption.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.options; +package org.geometerplus.zlibrary.core.options; /** * класс строковая опция. diff --git a/src/org/zlibrary/core/resources/ZLMissingResource.java b/src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java similarity index 83% rename from src/org/zlibrary/core/resources/ZLMissingResource.java rename to src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java index 804a53923..877027414 100644 --- a/src/org/zlibrary/core/resources/ZLMissingResource.java +++ b/src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.resources; +package org.geometerplus.zlibrary.core.resources; final class ZLMissingResource extends ZLResource { static final String Value = "????????"; diff --git a/src/org/zlibrary/core/resources/ZLResource.java b/src/org/geometerplus/zlibrary/core/resources/ZLResource.java similarity index 86% rename from src/org/zlibrary/core/resources/ZLResource.java rename to src/org/geometerplus/zlibrary/core/resources/ZLResource.java index 4d4cde76b..6b1e1668e 100644 --- a/src/org/zlibrary/core/resources/ZLResource.java +++ b/src/org/geometerplus/zlibrary/core/resources/ZLResource.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.resources; +package org.geometerplus.zlibrary.core.resources; -import org.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.library.ZLibrary; abstract public class ZLResource { public final String Name; diff --git a/src/org/zlibrary/core/resources/ZLTreeResource.java b/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java similarity index 87% rename from src/org/zlibrary/core/resources/ZLTreeResource.java rename to src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java index d473b20f5..4940cd268 100644 --- a/src/org/zlibrary/core/resources/ZLTreeResource.java +++ b/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java @@ -1,11 +1,11 @@ -package org.zlibrary.core.resources; +package org.geometerplus.zlibrary.core.resources; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLReaderAdapter; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; final class ZLTreeResource extends ZLResource { public static ZLTreeResource ourRoot; diff --git a/src/org/zlibrary/core/util/CharacterUtil.java b/src/org/geometerplus/zlibrary/core/util/CharacterUtil.java similarity index 95% rename from src/org/zlibrary/core/util/CharacterUtil.java rename to src/org/geometerplus/zlibrary/core/util/CharacterUtil.java index c234d50d0..0535d0a89 100644 --- a/src/org/zlibrary/core/util/CharacterUtil.java +++ b/src/org/geometerplus/zlibrary/core/util/CharacterUtil.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public abstract class CharacterUtil { public static boolean isLetter(char ch) { diff --git a/src/org/zlibrary/core/util/ZLArrayUtils.java b/src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java similarity index 96% rename from src/org/zlibrary/core/util/ZLArrayUtils.java rename to src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java index c83f988dc..94b31f534 100644 --- a/src/org/zlibrary/core/util/ZLArrayUtils.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public abstract class ZLArrayUtils { public static boolean[] createCopy(boolean[] array, int dataSize, int newLength) { diff --git a/src/org/zlibrary/core/util/ZLBoolean3.java b/src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java similarity index 90% rename from src/org/zlibrary/core/util/ZLBoolean3.java rename to src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java index cb3ef60f2..4c3c41ba5 100644 --- a/src/org/zlibrary/core/util/ZLBoolean3.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public final class ZLBoolean3 { public static final int B3_FALSE = 0; diff --git a/src/org/zlibrary/core/util/ZLColor.java b/src/org/geometerplus/zlibrary/core/util/ZLColor.java similarity index 91% rename from src/org/zlibrary/core/util/ZLColor.java rename to src/org/geometerplus/zlibrary/core/util/ZLColor.java index 01ad87be1..26389fe2a 100644 --- a/src/org/zlibrary/core/util/ZLColor.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLColor.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; /** * class Color. Color is presented as the triple of short's (Red, Green, Blue components) diff --git a/src/org/zlibrary/core/util/ZLSearchPattern.java b/src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java similarity index 87% rename from src/org/zlibrary/core/util/ZLSearchPattern.java rename to src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java index 27e228078..516d0854a 100644 --- a/src/org/zlibrary/core/util/ZLSearchPattern.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public class ZLSearchPattern { /*package*/ boolean IgnoreCase; diff --git a/src/org/zlibrary/core/util/ZLSearchUtil.java b/src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java similarity index 93% rename from src/org/zlibrary/core/util/ZLSearchUtil.java rename to src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java index 6dadbd957..88b8af0ae 100644 --- a/src/org/zlibrary/core/util/ZLSearchUtil.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public class ZLSearchUtil { private ZLSearchUtil() { diff --git a/src/org/zlibrary/core/util/ZLTextBuffer.java b/src/org/geometerplus/zlibrary/core/util/ZLTextBuffer.java similarity index 96% rename from src/org/zlibrary/core/util/ZLTextBuffer.java rename to src/org/geometerplus/zlibrary/core/util/ZLTextBuffer.java index 63eda5a43..3b1fca041 100644 --- a/src/org/zlibrary/core/util/ZLTextBuffer.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLTextBuffer.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public final class ZLTextBuffer { private char[] myData; diff --git a/src/org/zlibrary/core/util/ZLUnicodeUtil.java b/src/org/geometerplus/zlibrary/core/util/ZLUnicodeUtil.java similarity index 85% rename from src/org/zlibrary/core/util/ZLUnicodeUtil.java rename to src/org/geometerplus/zlibrary/core/util/ZLUnicodeUtil.java index 0349b86a9..7a2b66ec3 100644 --- a/src/org/zlibrary/core/util/ZLUnicodeUtil.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLUnicodeUtil.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.util; +package org.geometerplus.zlibrary.core.util; public class ZLUnicodeUtil { public static int utf8Length(byte[] buffer, int str, int len) { diff --git a/src/org/zlibrary/core/view/ZLPaintContext.java b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java similarity index 96% rename from src/org/zlibrary/core/view/ZLPaintContext.java rename to src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java index 4be53cb82..ff1e53244 100644 --- a/src/org/zlibrary/core/view/ZLPaintContext.java +++ b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java @@ -1,9 +1,9 @@ -package org.zlibrary.core.view; +package org.geometerplus.zlibrary.core.view; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.image.ZLImageData; +import org.geometerplus.zlibrary.core.image.ZLImageData; abstract public class ZLPaintContext { private int myX = 0; diff --git a/src/org/zlibrary/core/view/ZLView.java b/src/org/geometerplus/zlibrary/core/view/ZLView.java similarity index 89% rename from src/org/zlibrary/core/view/ZLView.java rename to src/org/geometerplus/zlibrary/core/view/ZLView.java index d05d8b589..375c8ded9 100644 --- a/src/org/zlibrary/core/view/ZLView.java +++ b/src/org/geometerplus/zlibrary/core/view/ZLView.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.view; +package org.geometerplus.zlibrary.core.view; -import org.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.application.ZLApplication; abstract public class ZLView { private ZLApplication myApplication; diff --git a/src/org/zlibrary/core/view/ZLViewWidget.java b/src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java similarity index 93% rename from src/org/zlibrary/core/view/ZLViewWidget.java rename to src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java index 1922b26be..1abb3b585 100644 --- a/src/org/zlibrary/core/view/ZLViewWidget.java +++ b/src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.view; +package org.geometerplus.zlibrary.core.view; abstract public class ZLViewWidget { private ZLView myView; diff --git a/src/org/zlibrary/core/xml/ZLStringMap.java b/src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java similarity index 91% rename from src/org/zlibrary/core/xml/ZLStringMap.java rename to src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java index cb3a71a53..edaf09840 100644 --- a/src/org/zlibrary/core/xml/ZLStringMap.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.xml; +package org.geometerplus.zlibrary.core.xml; -import org.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; // optimized partially implemented map String -> String // key must be interned diff --git a/src/org/zlibrary/core/xml/ZLXMLProcessor.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java similarity index 76% rename from src/org/zlibrary/core/xml/ZLXMLProcessor.java rename to src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java index 057271307..827bf28ef 100644 --- a/src/org/zlibrary/core/xml/ZLXMLProcessor.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java @@ -1,10 +1,10 @@ -package org.zlibrary.core.xml; +package org.geometerplus.zlibrary.core.xml; import java.io.IOException; import java.io.InputStream; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.library.ZLibrary; public abstract class ZLXMLProcessor { public abstract boolean read(ZLXMLReader xmlReader, InputStream stream); diff --git a/src/org/zlibrary/core/xml/ZLXMLProcessorFactory.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessorFactory.java similarity index 83% rename from src/org/zlibrary/core/xml/ZLXMLProcessorFactory.java rename to src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessorFactory.java index bf8348608..e7935e311 100644 --- a/src/org/zlibrary/core/xml/ZLXMLProcessorFactory.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessorFactory.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xml; +package org.geometerplus.zlibrary.core.xml; public abstract class ZLXMLProcessorFactory { private static ZLXMLProcessorFactory ourInstance; diff --git a/src/org/zlibrary/core/xml/ZLXMLReader.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java similarity index 90% rename from src/org/zlibrary/core/xml/ZLXMLReader.java rename to src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java index 7458f9992..8f42ca8fe 100644 --- a/src/org/zlibrary/core/xml/ZLXMLReader.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xml; +package org.geometerplus.zlibrary.core.xml; import java.util.*; diff --git a/src/org/zlibrary/core/xml/ZLXMLReaderAdapter.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java similarity index 95% rename from src/org/zlibrary/core/xml/ZLXMLReaderAdapter.java rename to src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java index 956228e8f..524257429 100644 --- a/src/org/zlibrary/core/xml/ZLXMLReaderAdapter.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xml; +package org.geometerplus.zlibrary.core.xml; import java.util.*; diff --git a/src/org/zlibrary/core/xml/own/ZLMutableString.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLMutableString.java similarity index 93% rename from src/org/zlibrary/core/xml/own/ZLMutableString.java rename to src/org/geometerplus/zlibrary/core/xml/own/ZLMutableString.java index 3fb5b3ee3..a8a5d8802 100644 --- a/src/org/zlibrary/core/xml/own/ZLMutableString.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLMutableString.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.xml.own; +package org.geometerplus.zlibrary.core.xml.own; -import org.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; final class ZLMutableString { private char[] myData; diff --git a/src/org/zlibrary/core/xml/own/ZLOwnDTDParser.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnDTDParser.java similarity index 97% rename from src/org/zlibrary/core/xml/own/ZLOwnDTDParser.java rename to src/org/geometerplus/zlibrary/core/xml/own/ZLOwnDTDParser.java index 839983402..bfdd60aa9 100644 --- a/src/org/zlibrary/core/xml/own/ZLOwnDTDParser.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnDTDParser.java @@ -1,12 +1,12 @@ -package org.zlibrary.core.xml.own; +package org.geometerplus.zlibrary.core.xml.own; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; final class ZLOwnDTDParser { private static final byte IGNORABLE_WHITESPACE = 0; diff --git a/src/org/zlibrary/core/xml/own/ZLOwnXMLParser.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLParser.java similarity index 98% rename from src/org/zlibrary/core/xml/own/ZLOwnXMLParser.java rename to src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLParser.java index d1d1ef686..b804f1a97 100644 --- a/src/org/zlibrary/core/xml/own/ZLOwnXMLParser.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLParser.java @@ -1,15 +1,15 @@ -package org.zlibrary.core.xml.own; +package org.geometerplus.zlibrary.core.xml.own; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.*; -import org.zlibrary.core.util.*; -import org.zlibrary.core.filesystem.*; +import org.geometerplus.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.filesystem.*; -import org.zlibrary.core.util.ZLArrayUtils; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLReader; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLReader; final class ZLOwnXMLParser { private static final byte START_DOCUMENT = 0; diff --git a/src/org/zlibrary/core/xml/own/ZLOwnXMLProcessor.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessor.java similarity index 70% rename from src/org/zlibrary/core/xml/own/ZLOwnXMLProcessor.java rename to src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessor.java index 752a63587..74bb80c8b 100644 --- a/src/org/zlibrary/core/xml/own/ZLOwnXMLProcessor.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessor.java @@ -1,10 +1,10 @@ -package org.zlibrary.core.xml.own; +package org.geometerplus.zlibrary.core.xml.own; import java.io.InputStream; import java.io.IOException; -import org.zlibrary.core.xml.ZLXMLProcessor; -import org.zlibrary.core.xml.ZLXMLReader; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessor; +import org.geometerplus.zlibrary.core.xml.ZLXMLReader; public class ZLOwnXMLProcessor extends ZLXMLProcessor { public boolean read(ZLXMLReader reader, InputStream stream) { diff --git a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java new file mode 100644 index 000000000..bc8d4a97c --- /dev/null +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java @@ -0,0 +1,10 @@ +package org.geometerplus.zlibrary.core.xml.own; + +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessor; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessorFactory; + +public class ZLOwnXMLProcessorFactory extends ZLXMLProcessorFactory { + public ZLXMLProcessor createXMLProcessor() { + return new ZLOwnXMLProcessor(); + } +} diff --git a/src/org/zlibrary/core/xml/sax/SAXHandler.java b/src/org/geometerplus/zlibrary/core/xml/sax/SAXHandler.java similarity index 86% rename from src/org/zlibrary/core/xml/sax/SAXHandler.java rename to src/org/geometerplus/zlibrary/core/xml/sax/SAXHandler.java index 854a4f279..3aaf3cc88 100644 --- a/src/org/zlibrary/core/xml/sax/SAXHandler.java +++ b/src/org/geometerplus/zlibrary/core/xml/sax/SAXHandler.java @@ -1,12 +1,12 @@ -package org.zlibrary.core.xml.sax; +package org.geometerplus.zlibrary.core.xml.sax; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import org.zlibrary.core.xml.*; +import org.geometerplus.zlibrary.core.xml.*; class SAXHandler extends DefaultHandler { private ZLXMLReader myXMLReader; diff --git a/src/org/zlibrary/core/xml/sax/ZLSaxXMLProcessor.java b/src/org/geometerplus/zlibrary/core/xml/sax/ZLSaxXMLProcessor.java similarity index 77% rename from src/org/zlibrary/core/xml/sax/ZLSaxXMLProcessor.java rename to src/org/geometerplus/zlibrary/core/xml/sax/ZLSaxXMLProcessor.java index 81e71518a..f7838e404 100644 --- a/src/org/zlibrary/core/xml/sax/ZLSaxXMLProcessor.java +++ b/src/org/geometerplus/zlibrary/core/xml/sax/ZLSaxXMLProcessor.java @@ -1,4 +1,4 @@ -package org.zlibrary.core.xml.sax; +package org.geometerplus.zlibrary.core.xml.sax; import java.io.InputStream; import java.io.IOException; @@ -8,8 +8,8 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.xml.sax.SAXException; -import org.zlibrary.core.xml.ZLXMLProcessor; -import org.zlibrary.core.xml.ZLXMLReader; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessor; +import org.geometerplus.zlibrary.core.xml.ZLXMLReader; public class ZLSaxXMLProcessor extends ZLXMLProcessor { public boolean read(ZLXMLReader reader, InputStream stream) { diff --git a/src/org/zlibrary/core/xml/sax/ZLSaxXMLProcessorFactory.java b/src/org/geometerplus/zlibrary/core/xml/sax/ZLSaxXMLProcessorFactory.java similarity index 58% rename from src/org/zlibrary/core/xml/sax/ZLSaxXMLProcessorFactory.java rename to src/org/geometerplus/zlibrary/core/xml/sax/ZLSaxXMLProcessorFactory.java index 3dc452bf9..aa0c34e68 100644 --- a/src/org/zlibrary/core/xml/sax/ZLSaxXMLProcessorFactory.java +++ b/src/org/geometerplus/zlibrary/core/xml/sax/ZLSaxXMLProcessorFactory.java @@ -1,6 +1,6 @@ -package org.zlibrary.core.xml.sax; +package org.geometerplus.zlibrary.core.xml.sax; -import org.zlibrary.core.xml.ZLXMLProcessorFactory; +import org.geometerplus.zlibrary.core.xml.ZLXMLProcessorFactory; public class ZLSaxXMLProcessorFactory extends ZLXMLProcessorFactory { public ZLSaxXMLProcessor createXMLProcessor() { diff --git a/src/org/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java similarity index 87% rename from src/org/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java rename to src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java index c2cb401fb..7c638d263 100644 --- a/src/org/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.hyphenation; +package org.geometerplus.zlibrary.text.hyphenation; public final class ZLTextHyphenationInfo { final boolean[] myMask; diff --git a/src/org/zlibrary/text/hyphenation/ZLTextHyphenationReader.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java similarity index 84% rename from src/org/zlibrary/text/hyphenation/ZLTextHyphenationReader.java rename to src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java index 01344b069..5a3bb0412 100644 --- a/src/org/zlibrary/text/hyphenation/ZLTextHyphenationReader.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java @@ -1,8 +1,8 @@ -package org.zlibrary.text.hyphenation; +package org.geometerplus.zlibrary.text.hyphenation; -import org.zlibrary.core.xml.ZLStringMap; -import org.zlibrary.core.xml.ZLXMLReaderAdapter; -import org.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.xml.ZLStringMap; +import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; final class ZLTextHyphenationReader extends ZLXMLReaderAdapter { private static final String PATTERN = "pattern"; diff --git a/src/org/zlibrary/text/hyphenation/ZLTextHyphenator.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java similarity index 91% rename from src/org/zlibrary/text/hyphenation/ZLTextHyphenator.java rename to src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java index 5fc6e1501..6894c0c51 100644 --- a/src/org/zlibrary/text/hyphenation/ZLTextHyphenator.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java @@ -1,9 +1,9 @@ -package org.zlibrary.text.hyphenation; +package org.geometerplus.zlibrary.text.hyphenation; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.text.view.impl.ZLTextWord; +import org.geometerplus.zlibrary.text.view.impl.ZLTextWord; public abstract class ZLTextHyphenator { protected static ZLTextHyphenator ourInstance; diff --git a/src/org/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java similarity index 97% rename from src/org/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java rename to src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java index 279fce2d5..9ad94b466 100644 --- a/src/org/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.hyphenation; +package org.geometerplus.zlibrary.text.hyphenation; import java.util.Arrays; diff --git a/src/org/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java similarity index 90% rename from src/org/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java rename to src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java index 86b62c178..3d396b45b 100644 --- a/src/org/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java @@ -1,8 +1,8 @@ -package org.zlibrary.text.hyphenation; +package org.geometerplus.zlibrary.text.hyphenation; import java.util.*; -import org.zlibrary.core.util.*; -import org.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.library.ZLibrary; public final class ZLTextTeXHyphenator extends ZLTextHyphenator { private final HashMap myPatternTable = new HashMap(); diff --git a/src/org/zlibrary/text/model/ZLTextAlignmentType.java b/src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java similarity index 82% rename from src/org/zlibrary/text/model/ZLTextAlignmentType.java rename to src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java index 7fc9a6bf6..c2d791533 100644 --- a/src/org/zlibrary/text/model/ZLTextAlignmentType.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.model; +package org.geometerplus.zlibrary.text.model; public interface ZLTextAlignmentType { public static final byte ALIGN_UNDEFINED = 0; diff --git a/src/org/zlibrary/text/model/ZLTextModel.java b/src/org/geometerplus/zlibrary/text/model/ZLTextModel.java similarity index 72% rename from src/org/zlibrary/text/model/ZLTextModel.java rename to src/org/geometerplus/zlibrary/text/model/ZLTextModel.java index fd3fc4898..6671d72f9 100644 --- a/src/org/zlibrary/text/model/ZLTextModel.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextModel.java @@ -1,12 +1,12 @@ -package org.zlibrary.text.model; +package org.geometerplus.zlibrary.text.model; import java.util.ArrayList; -import org.zlibrary.core.util.ZLTextBuffer; -import org.zlibrary.core.image.ZLImageMap; +import org.geometerplus.zlibrary.core.util.ZLTextBuffer; +import org.geometerplus.zlibrary.core.image.ZLImageMap; -import org.zlibrary.text.model.impl.ZLTextForcedControlEntry; -import org.zlibrary.text.model.impl.ZLTextMark; +import org.geometerplus.zlibrary.text.model.impl.ZLTextForcedControlEntry; +import org.geometerplus.zlibrary.text.model.impl.ZLTextMark; public interface ZLTextModel { int getParagraphsNumber(); diff --git a/src/org/zlibrary/text/model/ZLTextParagraph.java b/src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java similarity index 84% rename from src/org/zlibrary/text/model/ZLTextParagraph.java rename to src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java index 702d8401e..7ea310a40 100644 --- a/src/org/zlibrary/text/model/ZLTextParagraph.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.model; +package org.geometerplus.zlibrary.text.model; -import org.zlibrary.text.model.impl.ZLImageEntry; +import org.geometerplus.zlibrary.text.model.impl.ZLImageEntry; public interface ZLTextParagraph { interface Entry { diff --git a/src/org/zlibrary/text/model/ZLTextPlainModel.java b/src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java similarity index 64% rename from src/org/zlibrary/text/model/ZLTextPlainModel.java rename to src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java index 1816ea89f..0f3367b75 100644 --- a/src/org/zlibrary/text/model/ZLTextPlainModel.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.model; +package org.geometerplus.zlibrary.text.model; public interface ZLTextPlainModel extends ZLTextModel { void createParagraph(byte kind); diff --git a/src/org/zlibrary/text/model/ZLTextTreeModel.java b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeModel.java similarity index 85% rename from src/org/zlibrary/text/model/ZLTextTreeModel.java rename to src/org/geometerplus/zlibrary/text/model/ZLTextTreeModel.java index 293438547..4afba006c 100644 --- a/src/org/zlibrary/text/model/ZLTextTreeModel.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeModel.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.model; +package org.geometerplus.zlibrary.text.model; public interface ZLTextTreeModel extends ZLTextModel { ZLTextTreeParagraph getTreeParagraph(int index); diff --git a/src/org/zlibrary/text/model/ZLTextTreeParagraph.java b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraph.java similarity index 74% rename from src/org/zlibrary/text/model/ZLTextTreeParagraph.java rename to src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraph.java index b41177b8b..6889549f4 100644 --- a/src/org/zlibrary/text/model/ZLTextTreeParagraph.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraph.java @@ -1,7 +1,7 @@ -package org.zlibrary.text.model; +package org.geometerplus.zlibrary.text.model; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public interface ZLTextTreeParagraph extends ZLTextParagraph { boolean isOpen(); diff --git a/src/org/zlibrary/text/model/impl/ZLImageEntry.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLImageEntry.java similarity index 60% rename from src/org/zlibrary/text/model/impl/ZLImageEntry.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLImageEntry.java index 979849fb4..c82cd8175 100644 --- a/src/org/zlibrary/text/model/impl/ZLImageEntry.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLImageEntry.java @@ -1,8 +1,8 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; -import org.zlibrary.core.image.ZLImage; -import org.zlibrary.core.image.ZLImageMap; -import org.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.core.image.ZLImage; +import org.geometerplus.zlibrary.core.image.ZLImageMap; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; public final class ZLImageEntry { private final ZLImageMap myImageMap; diff --git a/src/org/zlibrary/text/model/impl/ZLModelFactory.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLModelFactory.java similarity index 73% rename from src/org/zlibrary/text/model/impl/ZLModelFactory.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLModelFactory.java index 7e0f92761..376a667dd 100644 --- a/src/org/zlibrary/text/model/impl/ZLModelFactory.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLModelFactory.java @@ -1,10 +1,10 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; -import org.zlibrary.text.model.ZLTextModel; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.ZLTextPlainModel; -import org.zlibrary.text.model.ZLTextTreeModel; -import org.zlibrary.text.model.ZLTextTreeParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextPlainModel; +import org.geometerplus.zlibrary.text.model.ZLTextTreeModel; +import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph; public class ZLModelFactory { diff --git a/src/org/zlibrary/text/model/impl/ZLTextForcedControlEntry.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextForcedControlEntry.java similarity index 74% rename from src/org/zlibrary/text/model/impl/ZLTextForcedControlEntry.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextForcedControlEntry.java index 3bfd90858..e5a89828e 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextForcedControlEntry.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextForcedControlEntry.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; -import org.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; public interface ZLTextForcedControlEntry extends ZLTextParagraph.Entry { boolean isLeftIndentSupported(); diff --git a/src/org/zlibrary/text/model/impl/ZLTextForcedControlEntryImpl.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextForcedControlEntryImpl.java similarity index 88% rename from src/org/zlibrary/text/model/impl/ZLTextForcedControlEntryImpl.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextForcedControlEntryImpl.java index d3ff7de07..1783ae118 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextForcedControlEntryImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextForcedControlEntryImpl.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; -import org.zlibrary.text.model.ZLTextAlignmentType; +import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; class ZLTextForcedControlEntryImpl implements ZLTextForcedControlEntry { private final static int SUPPORTS_LEFT_INDENT = 1; diff --git a/src/org/zlibrary/text/model/impl/ZLTextMark.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextMark.java similarity index 90% rename from src/org/zlibrary/text/model/impl/ZLTextMark.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextMark.java index 2439bff3a..7d2073714 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextMark.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextMark.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; public class ZLTextMark { public int ParagraphNumber; diff --git a/src/org/zlibrary/text/model/impl/ZLTextModelImpl.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextModelImpl.java similarity index 93% rename from src/org/zlibrary/text/model/impl/ZLTextModelImpl.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextModelImpl.java index 35e2e8cbc..46d134003 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextModelImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextModelImpl.java @@ -1,13 +1,13 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.image.ZLImageMap; -import org.zlibrary.core.util.ZLArrayUtils; -import org.zlibrary.core.util.ZLTextBuffer; -import org.zlibrary.text.model.ZLTextModel; -import org.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.core.image.ZLImageMap; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.core.util.ZLTextBuffer; +import org.geometerplus.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; abstract class ZLTextModelImpl implements ZLTextModel { private final ArrayList myEntries = new ArrayList(); diff --git a/src/org/zlibrary/text/model/impl/ZLTextParagraphImpl.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextParagraphImpl.java similarity index 77% rename from src/org/zlibrary/text/model/impl/ZLTextParagraphImpl.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextParagraphImpl.java index f95ce0926..b3a0c9c9b 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextParagraphImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextParagraphImpl.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; -import org.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; class ZLTextParagraphImpl implements ZLTextParagraph { private final ZLTextModelImpl myModel; diff --git a/src/org/zlibrary/text/model/impl/ZLTextPlainModelImpl.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextPlainModelImpl.java similarity index 76% rename from src/org/zlibrary/text/model/impl/ZLTextPlainModelImpl.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextPlainModelImpl.java index 5619d8b27..f33bea959 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextPlainModelImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextPlainModelImpl.java @@ -1,8 +1,8 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; -import org.zlibrary.core.util.ZLArrayUtils; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.ZLTextPlainModel; +import org.geometerplus.zlibrary.core.util.ZLArrayUtils; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextPlainModel; public final class ZLTextPlainModelImpl extends ZLTextModelImpl implements ZLTextPlainModel { private byte[] myParagraphKinds = new byte[INITIAL_CAPACITY]; diff --git a/src/org/zlibrary/text/model/impl/ZLTextSpecialParagraphImpl.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextSpecialParagraphImpl.java similarity index 83% rename from src/org/zlibrary/text/model/impl/ZLTextSpecialParagraphImpl.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextSpecialParagraphImpl.java index 9dc81c0d5..78aabf7b9 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextSpecialParagraphImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextSpecialParagraphImpl.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; class ZLTextSpecialParagraphImpl extends ZLTextParagraphImpl { private final byte myKind; diff --git a/src/org/zlibrary/text/model/impl/ZLTextTreeModelImpl.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextTreeModelImpl.java similarity index 80% rename from src/org/zlibrary/text/model/impl/ZLTextTreeModelImpl.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextTreeModelImpl.java index 1305fa083..15bdee8a7 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextTreeModelImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextTreeModelImpl.java @@ -1,11 +1,11 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.ZLTextTreeModel; -import org.zlibrary.text.model.ZLTextTreeParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextTreeModel; +import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph; public class ZLTextTreeModelImpl extends ZLTextModelImpl implements ZLTextTreeModel { private final ArrayList myParagraphs = new ArrayList(); diff --git a/src/org/zlibrary/text/model/impl/ZLTextTreeParagraphImpl.java b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextTreeParagraphImpl.java similarity index 87% rename from src/org/zlibrary/text/model/impl/ZLTextTreeParagraphImpl.java rename to src/org/geometerplus/zlibrary/text/model/impl/ZLTextTreeParagraphImpl.java index 9e97d3f63..b58e298b9 100644 --- a/src/org/zlibrary/text/model/impl/ZLTextTreeParagraphImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/impl/ZLTextTreeParagraphImpl.java @@ -1,8 +1,8 @@ -package org.zlibrary.text.model.impl; +package org.geometerplus.zlibrary.text.model.impl; import java.util.*; -import org.zlibrary.core.util.*; -import org.zlibrary.text.model.ZLTextTreeParagraph; +import org.geometerplus.zlibrary.core.util.*; +import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph; final class ZLTextTreeParagraphImpl extends ZLTextParagraphImpl implements ZLTextTreeParagraph { private boolean myIsOpen; diff --git a/src/org/zlibrary/text/view/ZLTextAlignmentOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java similarity index 86% rename from src/org/zlibrary/text/view/ZLTextAlignmentOptionEntry.java rename to src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java index 811ab7616..93f331995 100644 --- a/src/org/zlibrary/text/view/ZLTextAlignmentOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java @@ -1,10 +1,10 @@ -package org.zlibrary.text.view; +package org.geometerplus.zlibrary.text.view; import java.util.ArrayList; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.resources.ZLResource; public class ZLTextAlignmentOptionEntry extends ZLComboOptionEntry { private static final String KEY_LEFT = "left"; diff --git a/src/org/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java similarity index 74% rename from src/org/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java rename to src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java index 96869232c..35f76506f 100644 --- a/src/org/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java @@ -1,11 +1,11 @@ -package org.zlibrary.text.view; +package org.geometerplus.zlibrary.text.view; import java.util.ArrayList; -import org.zlibrary.core.optionEntries.ZLFontFamilyOptionEntry; -import org.zlibrary.core.options.ZLStringOption; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.core.optionEntries.ZLFontFamilyOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; public class ZLTextFontFamilyWithBaseOptionEntry extends ZLFontFamilyOptionEntry { private static final String KEY_UNCHANGED = "unchanged"; diff --git a/src/org/zlibrary/text/view/ZLTextIndicatorInfo.java b/src/org/geometerplus/zlibrary/text/view/ZLTextIndicatorInfo.java similarity index 83% rename from src/org/zlibrary/text/view/ZLTextIndicatorInfo.java rename to src/org/geometerplus/zlibrary/text/view/ZLTextIndicatorInfo.java index a37c24d66..dccc9912b 100644 --- a/src/org/zlibrary/text/view/ZLTextIndicatorInfo.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextIndicatorInfo.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.view; +package org.geometerplus.zlibrary.text.view; -import org.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.util.ZLColor; public abstract class ZLTextIndicatorInfo { protected ZLTextIndicatorInfo() { diff --git a/src/org/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java similarity index 82% rename from src/org/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java rename to src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java index 77b5fdf04..11b05fe95 100644 --- a/src/org/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java @@ -1,11 +1,11 @@ -package org.zlibrary.text.view; +package org.geometerplus.zlibrary.text.view; import java.util.ArrayList; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.dialogs.ZLComboOptionEntry; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.dialogs.ZLComboOptionEntry; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.resources.ZLResource; public class ZLTextLineSpaceOptionEntry extends ZLComboOptionEntry { diff --git a/src/org/zlibrary/text/view/ZLTextStyle.java b/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java similarity index 80% rename from src/org/zlibrary/text/view/ZLTextStyle.java rename to src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java index 026926088..1f0634e5d 100644 --- a/src/org/zlibrary/text/view/ZLTextStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.view; +package org.geometerplus.zlibrary.text.view; -import org.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.util.ZLColor; public interface ZLTextStyle { String getFontFamily(); diff --git a/src/org/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java similarity index 77% rename from src/org/zlibrary/text/view/ZLTextView.java rename to src/org/geometerplus/zlibrary/text/view/ZLTextView.java index e0416c7f3..5ef546aaa 100644 --- a/src/org/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -1,10 +1,10 @@ -package org.zlibrary.text.view; +package org.geometerplus.zlibrary.text.view; -import org.zlibrary.core.view.ZLView; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.view.ZLView; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.core.application.ZLApplication; -import org.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.model.ZLTextModel; public abstract class ZLTextView extends ZLView { public interface ScrollingMode { diff --git a/src/org/zlibrary/text/view/impl/ZLTextControlElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextControlElement.java similarity index 93% rename from src/org/zlibrary/text/view/impl/ZLTextControlElement.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextControlElement.java index e44f03c1e..86cc3bdfd 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextControlElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextControlElement.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; public class ZLTextControlElement extends ZLTextElement { private final static ZLTextControlElement[] myStartElements = new ZLTextControlElement[256]; diff --git a/src/org/zlibrary/text/view/impl/ZLTextElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElement.java similarity index 81% rename from src/org/zlibrary/text/view/impl/ZLTextElement.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextElement.java index b4e5d0d56..35c691e08 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElement.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; public class ZLTextElement { final static ZLTextElement HSpace = new ZLTextElement(); diff --git a/src/org/zlibrary/text/view/impl/ZLTextElementArea.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElementArea.java similarity index 88% rename from src/org/zlibrary/text/view/impl/ZLTextElementArea.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextElementArea.java index cc2983eae..94d9e5aaf 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextElementArea.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElementArea.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; -import org.zlibrary.text.view.ZLTextStyle; +import org.geometerplus.zlibrary.text.view.ZLTextStyle; public class ZLTextElementArea extends ZLTextRectangularArea { public final int ParagraphNumber; diff --git a/src/org/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java similarity index 91% rename from src/org/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java index 0de5a9429..35eb29c00 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; public class ZLTextFixedHSpaceElement extends ZLTextElement { private final static ZLTextElement[] ourCollection = new ZLTextElement[20]; diff --git a/src/org/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java similarity index 80% rename from src/org/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java index 26a2774b1..693ee810a 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; public final class ZLTextHyperlinkControlElement extends ZLTextControlElement { public final String Label; diff --git a/src/org/zlibrary/text/view/impl/ZLTextImageElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextImageElement.java similarity index 68% rename from src/org/zlibrary/text/view/impl/ZLTextImageElement.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextImageElement.java index 6552db8c3..acd66e076 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextImageElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextImageElement.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; -import org.zlibrary.core.image.ZLImageData; +import org.geometerplus.zlibrary.core.image.ZLImageData; public final class ZLTextImageElement extends ZLTextElement { public final String Id; diff --git a/src/org/zlibrary/text/view/impl/ZLTextLineInfo.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfo.java similarity index 94% rename from src/org/zlibrary/text/view/impl/ZLTextLineInfo.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfo.java index 93ffbbbad..2ee2a2b83 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextLineInfo.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfo.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; -import org.zlibrary.text.view.*; +import org.geometerplus.zlibrary.text.view.*; final class ZLTextLineInfo { static final class TreeNodeInfo { diff --git a/src/org/zlibrary/text/view/impl/ZLTextLineInfoCache.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoCache.java similarity index 71% rename from src/org/zlibrary/text/view/impl/ZLTextLineInfoCache.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoCache.java index bf685bab3..819decd49 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextLineInfoCache.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoCache.java @@ -1,7 +1,7 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; final class ZLTextLineInfoCache extends HashMap { public void put(ZLTextLineInfo info) { diff --git a/src/org/zlibrary/text/view/impl/ZLTextLineInfoVector.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoVector.java similarity index 62% rename from src/org/zlibrary/text/view/impl/ZLTextLineInfoVector.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoVector.java index abccd3e85..e67121788 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextLineInfoVector.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoVector.java @@ -1,7 +1,7 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; final class ZLTextLineInfoVector extends ArrayList { ZLTextLineInfo getInfo(int index) { diff --git a/src/org/zlibrary/text/view/impl/ZLTextParagraphCursor.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursor.java similarity index 96% rename from src/org/zlibrary/text/view/impl/ZLTextParagraphCursor.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursor.java index a9ec17aeb..22998634b 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextParagraphCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursor.java @@ -1,11 +1,11 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.core.image.*; -import org.zlibrary.text.model.*; -import org.zlibrary.text.model.impl.*; +import org.geometerplus.zlibrary.core.image.*; +import org.geometerplus.zlibrary.text.model.*; +import org.geometerplus.zlibrary.text.model.impl.*; public abstract class ZLTextParagraphCursor { private static abstract class Processor { diff --git a/src/org/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java similarity index 86% rename from src/org/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java index 41e43d36b..db91e3298 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java @@ -1,10 +1,10 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; import java.lang.ref.WeakReference; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.model.ZLTextModel; class ZLTextParagraphCursorCache { private final static class Key { diff --git a/src/org/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java similarity index 82% rename from src/org/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java index f01b40b8b..8c3b59749 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; -import org.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.model.ZLTextModel; class ZLTextPlainParagraphCursor extends ZLTextParagraphCursor { ZLTextPlainParagraphCursor(ZLTextModel model, int index) { diff --git a/src/org/zlibrary/text/view/impl/ZLTextRectangularArea.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularArea.java similarity index 73% rename from src/org/zlibrary/text/view/impl/ZLTextRectangularArea.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularArea.java index f3b28893e..291166218 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextRectangularArea.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularArea.java @@ -1,7 +1,7 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; class ZLTextRectangularArea { final int XStart; diff --git a/src/org/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java similarity index 92% rename from src/org/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java index fcea2be8a..5b6d7566d 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java @@ -1,7 +1,7 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; import java.util.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; final class ZLTextRectangularAreaVector extends ArrayList { ZLTextRectangularArea getArea(int index) { diff --git a/src/org/zlibrary/text/view/impl/ZLTextTreeNodeArea.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeNodeArea.java similarity index 83% rename from src/org/zlibrary/text/view/impl/ZLTextTreeNodeArea.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeNodeArea.java index 25e0d28b3..ab1d588bf 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextTreeNodeArea.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeNodeArea.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; final class ZLTextTreeNodeArea extends ZLTextRectangularArea { final int ParagraphNumber; diff --git a/src/org/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java similarity index 95% rename from src/org/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java index 8a5bb6a42..6d400b48b 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; -import org.zlibrary.text.model.*; +import org.geometerplus.zlibrary.text.model.*; final class ZLTextTreeParagraphCursor extends ZLTextParagraphCursor { ZLTextTreeParagraphCursor(ZLTextTreeModel model, int index) { diff --git a/src/org/zlibrary/text/view/impl/ZLTextViewImpl.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextViewImpl.java similarity index 99% rename from src/org/zlibrary/text/view/impl/ZLTextViewImpl.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextViewImpl.java index f6a90c5d8..824dd9622 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextViewImpl.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextViewImpl.java @@ -1,12 +1,12 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.view.ZLPaintContext; -import org.zlibrary.text.model.*; -import org.zlibrary.text.model.impl.ZLTextMark; -import org.zlibrary.text.hyphenation.*; -import org.zlibrary.text.view.*; -import org.zlibrary.text.view.style.*; +import org.geometerplus.zlibrary.core.application.ZLApplication; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.text.model.*; +import org.geometerplus.zlibrary.text.model.impl.ZLTextMark; +import org.geometerplus.zlibrary.text.hyphenation.*; +import org.geometerplus.zlibrary.text.view.*; +import org.geometerplus.zlibrary.text.view.style.*; public abstract class ZLTextViewImpl extends ZLTextView { private ZLTextModel myModel; diff --git a/src/org/zlibrary/text/view/impl/ZLTextWord.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWord.java similarity index 93% rename from src/org/zlibrary/text/view/impl/ZLTextWord.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextWord.java index bda6517cc..c8c9f4696 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextWord.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWord.java @@ -1,6 +1,6 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; -import org.zlibrary.core.view.ZLPaintContext; +import org.geometerplus.zlibrary.core.view.ZLPaintContext; public final class ZLTextWord extends ZLTextElement { public final char[] Data; diff --git a/src/org/zlibrary/text/view/impl/ZLTextWordCursor.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWordCursor.java similarity index 97% rename from src/org/zlibrary/text/view/impl/ZLTextWordCursor.java rename to src/org/geometerplus/zlibrary/text/view/impl/ZLTextWordCursor.java index a8ca2faca..ad2fb4591 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextWordCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWordCursor.java @@ -1,8 +1,8 @@ -package org.zlibrary.text.view.impl; +package org.geometerplus.zlibrary.text.view.impl; //import java.util.*; -import org.zlibrary.text.model.impl.ZLTextMark; +import org.geometerplus.zlibrary.text.model.impl.ZLTextMark; public final class ZLTextWordCursor { private ZLTextParagraphCursor myParagraphCursor; diff --git a/src/org/zlibrary/text/view/style/HyperlinkStyle.java b/src/org/geometerplus/zlibrary/text/view/style/HyperlinkStyle.java similarity index 59% rename from src/org/zlibrary/text/view/style/HyperlinkStyle.java rename to src/org/geometerplus/zlibrary/text/view/style/HyperlinkStyle.java index 35dab01c2..b1e654f36 100644 --- a/src/org/zlibrary/text/view/style/HyperlinkStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/HyperlinkStyle.java @@ -1,4 +1,4 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; interface HyperlinkStyle { byte NONE = 0; diff --git a/src/org/zlibrary/text/view/style/ZLTextBaseStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java similarity index 91% rename from src/org/zlibrary/text/view/style/ZLTextBaseStyle.java rename to src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java index dd1bd23ed..41b5d1a41 100644 --- a/src/org/zlibrary/text/view/style/ZLTextBaseStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java @@ -1,10 +1,10 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; -import org.zlibrary.core.options.*; -import org.zlibrary.core.util.ZLColor; -import org.zlibrary.text.view.ZLTextStyle; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.text.view.ZLTextStyle; -import org.zlibrary.text.model.ZLTextAlignmentType; +import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; public class ZLTextBaseStyle implements ZLTextStyle { private final String CATEGORY = ZLOption.LOOK_AND_FEEL_CATEGORY; diff --git a/src/org/zlibrary/text/view/style/ZLTextDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java similarity index 92% rename from src/org/zlibrary/text/view/style/ZLTextDecoratedStyle.java rename to src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java index 2c3913b44..88c3ff0dc 100644 --- a/src/org/zlibrary/text/view/style/ZLTextDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java @@ -1,8 +1,8 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; -import org.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.util.ZLColor; -import org.zlibrary.text.view.ZLTextStyle; +import org.geometerplus.zlibrary.text.view.ZLTextStyle; public abstract class ZLTextDecoratedStyle { private ZLTextStyle myBase; diff --git a/src/org/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java similarity index 92% rename from src/org/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java rename to src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java index 46b783a4f..29d126445 100644 --- a/src/org/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java @@ -1,9 +1,9 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; -import org.zlibrary.text.view.ZLTextStyle; -import org.zlibrary.text.model.ZLTextAlignmentType; +import org.geometerplus.zlibrary.text.view.ZLTextStyle; +import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; public class ZLTextFullDecoratedStyle extends ZLTextDecoratedStyle implements ZLTextStyle { private final ZLTextFullStyleDecoration myDecoration; diff --git a/src/org/zlibrary/text/view/style/ZLTextFullStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java similarity index 87% rename from src/org/zlibrary/text/view/style/ZLTextFullStyleDecoration.java rename to src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java index 553cdb2a5..e70d5cf5d 100644 --- a/src/org/zlibrary/text/view/style/ZLTextFullStyleDecoration.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java @@ -1,11 +1,11 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; -import org.zlibrary.core.options.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.text.view.ZLTextStyle; +import org.geometerplus.zlibrary.text.view.ZLTextStyle; -import org.zlibrary.text.model.ZLTextAlignmentType; +import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; public class ZLTextFullStyleDecoration extends ZLTextStyleDecoration { public final ZLIntegerRangeOption SpaceBeforeOption; diff --git a/src/org/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java similarity index 91% rename from src/org/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java rename to src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java index 16947f62c..c1ee59d42 100644 --- a/src/org/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java @@ -1,10 +1,10 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; -import org.zlibrary.text.view.ZLTextStyle; +import org.geometerplus.zlibrary.text.view.ZLTextStyle; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.text.model.ZLTextAlignmentType; +import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; class ZLTextPartialDecoratedStyle extends ZLTextDecoratedStyle implements ZLTextStyle { private final ZLTextStyleDecoration myDecoration; diff --git a/src/org/zlibrary/text/view/style/ZLTextPositionIndicatorStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPositionIndicatorStyle.java similarity index 83% rename from src/org/zlibrary/text/view/style/ZLTextPositionIndicatorStyle.java rename to src/org/geometerplus/zlibrary/text/view/style/ZLTextPositionIndicatorStyle.java index 88beef681..356d6164d 100644 --- a/src/org/zlibrary/text/view/style/ZLTextPositionIndicatorStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPositionIndicatorStyle.java @@ -1,8 +1,8 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.options.ZLColorOption; -import org.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.options.ZLColorOption; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; public class ZLTextPositionIndicatorStyle { public ZLBooleanOption ShowOption; diff --git a/src/org/zlibrary/text/view/style/ZLTextStyleCollection.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java similarity index 90% rename from src/org/zlibrary/text/view/style/ZLTextStyleCollection.java rename to src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java index d89a77d61..00d50dd83 100644 --- a/src/org/zlibrary/text/view/style/ZLTextStyleCollection.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java @@ -1,10 +1,10 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; -import org.zlibrary.core.library.ZLibrary; -import org.zlibrary.core.util.ZLBoolean3; -import org.zlibrary.core.xml.*; -import org.zlibrary.text.model.ZLTextAlignmentType; -import org.zlibrary.text.view.ZLTextStyle; +import org.geometerplus.zlibrary.core.library.ZLibrary; +import org.geometerplus.zlibrary.core.util.ZLBoolean3; +import org.geometerplus.zlibrary.core.xml.*; +import org.geometerplus.zlibrary.text.model.ZLTextAlignmentType; +import org.geometerplus.zlibrary.text.view.ZLTextStyle; public class ZLTextStyleCollection { private static ZLTextStyleCollection ourInstance = null; diff --git a/src/org/zlibrary/text/view/style/ZLTextStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java similarity index 88% rename from src/org/zlibrary/text/view/style/ZLTextStyleDecoration.java rename to src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java index 155078176..54e157a4f 100644 --- a/src/org/zlibrary/text/view/style/ZLTextStyleDecoration.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java @@ -1,9 +1,9 @@ -package org.zlibrary.text.view.style; +package org.geometerplus.zlibrary.text.view.style; -import org.zlibrary.core.options.*; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.util.*; -import org.zlibrary.text.view.ZLTextStyle; +import org.geometerplus.zlibrary.text.view.ZLTextStyle; public class ZLTextStyleDecoration { static final String STYLE = "Style"; diff --git a/src/org/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java b/src/org/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java deleted file mode 100644 index 94c79916f..000000000 --- a/src/org/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.zlibrary.core.html.own; - -import org.zlibrary.core.html.ZLHtmlProcessor; -import org.zlibrary.core.html.ZLHtmlProcessorFactory; - -public class ZLOwnHtmlProcessorFactory extends ZLHtmlProcessorFactory { - public ZLHtmlProcessor createHtmlProcessor() { - return new ZLOwnHtmlProcessor(); - } -} diff --git a/src/org/zlibrary/core/html/own/test/Main.java b/src/org/zlibrary/core/html/own/test/Main.java deleted file mode 100644 index f26058675..000000000 --- a/src/org/zlibrary/core/html/own/test/Main.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.zlibrary.core.html.own.test; - - -import org.zlibrary.core.application.ZLApplication; -import org.zlibrary.core.html.ZLHtmlReaderAdapter; -import org.zlibrary.core.html.own.ZLOwnHtmlProcessorFactory; - -public class Main { - - private static ZLHtmlReaderAdapter myReader = new MyHtmlReader(); - - /** - * @param args - */ - public static void main(String[] args) { - // TODO Auto-generated method stub - new ZLOwnHtmlProcessorFactory(); - //myReader.read("src/org/zlibrary/core/html/own/test/test.html"); - myReader.read("src/org/zlibrary/core/html/own/test/subversion.htm"); - } -} diff --git a/src/org/zlibrary/core/image/ZLImageData.java b/src/org/zlibrary/core/image/ZLImageData.java deleted file mode 100644 index 0862d6553..000000000 --- a/src/org/zlibrary/core/image/ZLImageData.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.zlibrary.core.image; - -public interface ZLImageData { -} diff --git a/src/org/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java b/src/org/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java deleted file mode 100644 index 2ac19a1f2..000000000 --- a/src/org/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.zlibrary.core.xml.own; - -import org.zlibrary.core.xml.ZLXMLProcessor; -import org.zlibrary.core.xml.ZLXMLProcessorFactory; - -public class ZLOwnXMLProcessorFactory extends ZLXMLProcessorFactory { - public ZLXMLProcessor createXMLProcessor() { - return new ZLOwnXMLProcessor(); - } -} diff --git a/test/org/test/fbreader/collection/TestBookCollection.java b/test/org/test/fbreader/collection/TestBookCollection.java index dd817dbe5..c66676ab6 100644 --- a/test/org/test/fbreader/collection/TestBookCollection.java +++ b/test/org/test/fbreader/collection/TestBookCollection.java @@ -5,12 +5,12 @@ import java.util.Locale; import junit.framework.TestCase; -import org.fbreader.collection.BookCollection; -import org.fbreader.description.Author; -import org.fbreader.description.BookDescription; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.fbreader.collection.BookCollection; +import org.geometerplus.fbreader.description.Author; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; public class TestBookCollection extends TestCase { private final String filename = "testfb2book.fb2"; diff --git a/test/org/test/fbreader/collection/TestBookList.java b/test/org/test/fbreader/collection/TestBookList.java index 6993d8625..dd76bba0d 100644 --- a/test/org/test/fbreader/collection/TestBookList.java +++ b/test/org/test/fbreader/collection/TestBookList.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import junit.framework.TestCase; -import org.fbreader.collection.BookList; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.fbreader.collection.BookList; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; public class TestBookList extends TestCase { private final String filename = "testfb2book.fb2"; diff --git a/test/org/test/fbreader/formats/fb2/TestFB2Reader.java b/test/org/test/fbreader/formats/fb2/TestFB2Reader.java index a93a1f19d..26568f473 100644 --- a/test/org/test/fbreader/formats/fb2/TestFB2Reader.java +++ b/test/org/test/fbreader/formats/fb2/TestFB2Reader.java @@ -1,17 +1,17 @@ package org.test.fbreader.formats.fb2; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.bookmodel.ContentsModel; -import org.fbreader.formats.fb2.FB2Reader; -import org.zlibrary.core.image.*; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.bookmodel.ContentsModel; +import org.geometerplus.fbreader.formats.fb2.FB2Reader; +import org.geometerplus.zlibrary.core.image.*; -import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; -import org.zlibrary.text.model.ZLTextModel; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.ZLTextTreeParagraph; -import org.zlibrary.text.model.impl.ZLImageEntry; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; -import org.zlibrary.ui.swing.view.ZLSwingPaintContext; +import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; +import org.geometerplus.zlibrary.text.model.ZLTextModel; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLImageEntry; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.zlibrary.ui.swing.view.ZLSwingPaintContext; import org.test.zlibrary.model.ModelDumper; diff --git a/test/org/test/zlibrary/core/resources/TestResources.java b/test/org/test/zlibrary/core/resources/TestResources.java index 75478aaa2..62b0c4c1d 100644 --- a/test/org/test/zlibrary/core/resources/TestResources.java +++ b/test/org/test/zlibrary/core/resources/TestResources.java @@ -2,9 +2,9 @@ package org.test.zlibrary.core.resources; import java.util.*; -import org.zlibrary.core.resources.ZLResource; -import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.zlibrary.core.resources.ZLResource; +import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; import junit.framework.TestCase; diff --git a/test/org/test/zlibrary/description/TestDescriptionBook.java b/test/org/test/zlibrary/description/TestDescriptionBook.java index f4896d89d..f534de0ac 100644 --- a/test/org/test/zlibrary/description/TestDescriptionBook.java +++ b/test/org/test/zlibrary/description/TestDescriptionBook.java @@ -2,11 +2,11 @@ package org.test.zlibrary.description; import junit.framework.TestCase; -import org.fbreader.bookmodel.BookModel; -import org.fbreader.description.Author; -import org.fbreader.description.BookDescription; -import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.fbreader.bookmodel.BookModel; +import org.geometerplus.fbreader.description.Author; +import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; public class TestDescriptionBook extends TestCase { private final String filename = "testfb2book.fb2"; diff --git a/test/org/test/zlibrary/filesystem/TestZLDir.java b/test/org/test/zlibrary/filesystem/TestZLDir.java index 4ead11bed..c7585733e 100644 --- a/test/org/test/zlibrary/filesystem/TestZLDir.java +++ b/test/org/test/zlibrary/filesystem/TestZLDir.java @@ -2,9 +2,9 @@ package org.test.zlibrary.filesystem; import java.util.ArrayList; -import org.zlibrary.core.filesystem.ZLDir; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.zlibrary.core.filesystem.ZLDir; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; import junit.framework.TestCase; diff --git a/test/org/test/zlibrary/filesystem/TestZLFSManager.java b/test/org/test/zlibrary/filesystem/TestZLFSManager.java index 175fa4938..4d12c9696 100644 --- a/test/org/test/zlibrary/filesystem/TestZLFSManager.java +++ b/test/org/test/zlibrary/filesystem/TestZLFSManager.java @@ -2,9 +2,9 @@ package org.test.zlibrary.filesystem; import junit.framework.TestCase; -import org.zlibrary.core.filesystem.ZLFSDir; -//import org.zlibrary.core.filesystem.ZLFSManagerUtil; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.zlibrary.core.filesystem.ZLFSDir; +//import org.geometerplus.zlibrary.core.filesystem.ZLFSManagerUtil; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; public class TestZLFSManager extends TestCase { diff --git a/test/org/test/zlibrary/filesystem/TestZLFile.java b/test/org/test/zlibrary/filesystem/TestZLFile.java index c7446fe99..c2dc1409d 100644 --- a/test/org/test/zlibrary/filesystem/TestZLFile.java +++ b/test/org/test/zlibrary/filesystem/TestZLFile.java @@ -3,9 +3,9 @@ package org.test.zlibrary.filesystem; import junit.framework.TestCase; -import org.zlibrary.core.filesystem.ZLDir; -import org.zlibrary.core.filesystem.ZLFile; -import org.zlibrary.ui.swing.library.ZLSwingLibrary; +import org.geometerplus.zlibrary.core.filesystem.ZLDir; +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.ui.swing.library.ZLSwingLibrary; public class TestZLFile extends TestCase { private final String filename = "testfb2book.fb2"; diff --git a/test/org/test/zlibrary/hyphenation/TestTextTeXHyphenationPattern.java b/test/org/test/zlibrary/hyphenation/TestTextTeXHyphenationPattern.java index dba23c92a..5e09118d3 100644 --- a/test/org/test/zlibrary/hyphenation/TestTextTeXHyphenationPattern.java +++ b/test/org/test/zlibrary/hyphenation/TestTextTeXHyphenationPattern.java @@ -2,7 +2,7 @@ package org.test.zlibrary.hyphenation; import java.util.Arrays; -import org.zlibrary.text.hyphenation.ZLTextTeXHyphenationPattern; +import org.geometerplus.zlibrary.text.hyphenation.ZLTextTeXHyphenationPattern; import junit.framework.TestCase; diff --git a/test/org/test/zlibrary/hyphenation/TestTextTeXHyphenator.java b/test/org/test/zlibrary/hyphenation/TestTextTeXHyphenator.java index 4a930517e..3a9ed7145 100644 --- a/test/org/test/zlibrary/hyphenation/TestTextTeXHyphenator.java +++ b/test/org/test/zlibrary/hyphenation/TestTextTeXHyphenator.java @@ -2,7 +2,7 @@ package org.test.zlibrary.hyphenation; import java.util.Arrays; -import org.zlibrary.text.hyphenation.ZLTextTeXHyphenator; +import org.geometerplus.zlibrary.text.hyphenation.ZLTextTeXHyphenator; import junit.framework.TestCase; diff --git a/test/org/test/zlibrary/model/ModelDumper.java b/test/org/test/zlibrary/model/ModelDumper.java index 917e42a51..0a70af4de 100644 --- a/test/org/test/zlibrary/model/ModelDumper.java +++ b/test/org/test/zlibrary/model/ModelDumper.java @@ -1,6 +1,6 @@ package org.test.zlibrary.model; -import org.zlibrary.text.model.*; +import org.geometerplus.zlibrary.text.model.*; public class ModelDumper { public static String dump(ZLTextModel model) { diff --git a/test/org/test/zlibrary/model/TestTextControlEntry.java b/test/org/test/zlibrary/model/TestTextControlEntry.java index 68caf44cd..6d0824a08 100644 --- a/test/org/test/zlibrary/model/TestTextControlEntry.java +++ b/test/org/test/zlibrary/model/TestTextControlEntry.java @@ -1,6 +1,6 @@ package org.test.zlibrary.model; -import org.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; import junit.framework.TestCase; diff --git a/test/org/test/zlibrary/model/TestTextEntry.java b/test/org/test/zlibrary/model/TestTextEntry.java index 575990101..85c4dbfc0 100644 --- a/test/org/test/zlibrary/model/TestTextEntry.java +++ b/test/org/test/zlibrary/model/TestTextEntry.java @@ -2,7 +2,7 @@ package org.test.zlibrary.model; import junit.framework.TestCase; -import org.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; public class TestTextEntry extends TestCase { private ZLModelFactory factory = new ZLModelFactory(); diff --git a/test/org/test/zlibrary/model/TestTextParagraph.java b/test/org/test/zlibrary/model/TestTextParagraph.java index 0c0f8ec7f..a16b7ae6a 100644 --- a/test/org/test/zlibrary/model/TestTextParagraph.java +++ b/test/org/test/zlibrary/model/TestTextParagraph.java @@ -1,7 +1,7 @@ package org.test.zlibrary.model; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; import junit.framework.TestCase; diff --git a/test/org/test/zlibrary/model/TestTreeModel.java b/test/org/test/zlibrary/model/TestTreeModel.java index bf1357244..1c761a080 100644 --- a/test/org/test/zlibrary/model/TestTreeModel.java +++ b/test/org/test/zlibrary/model/TestTreeModel.java @@ -1,8 +1,8 @@ package org.test.zlibrary.model; -import org.zlibrary.text.model.ZLTextTreeModel; -import org.zlibrary.text.model.ZLTextTreeParagraph; -import org.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.text.model.ZLTextTreeModel; +import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; import junit.framework.TestCase; diff --git a/test/org/test/zlibrary/model/TestTreeParagraph.java b/test/org/test/zlibrary/model/TestTreeParagraph.java index 014964d08..5a2484691 100644 --- a/test/org/test/zlibrary/model/TestTreeParagraph.java +++ b/test/org/test/zlibrary/model/TestTreeParagraph.java @@ -2,8 +2,8 @@ package org.test.zlibrary.model; import java.util.List; -import org.zlibrary.text.model.ZLTextTreeParagraph; -import org.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.text.model.ZLTextTreeParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; import junit.framework.TestCase; diff --git a/test/org/test/zlibrary/model/TestZLTextModel.java b/test/org/test/zlibrary/model/TestZLTextModel.java index 28e5f4314..26a55b868 100644 --- a/test/org/test/zlibrary/model/TestZLTextModel.java +++ b/test/org/test/zlibrary/model/TestZLTextModel.java @@ -2,12 +2,12 @@ package org.test.zlibrary.model; import junit.framework.TestCase; -import org.zlibrary.core.util.ZLTextBuffer; +import org.geometerplus.zlibrary.core.util.ZLTextBuffer; -import org.zlibrary.text.model.ZLTextPlainModel; -import org.zlibrary.text.model.ZLTextParagraph; -import org.zlibrary.text.model.impl.ZLTextForcedControlEntry; -import org.zlibrary.text.model.impl.ZLModelFactory; +import org.geometerplus.zlibrary.text.model.ZLTextPlainModel; +import org.geometerplus.zlibrary.text.model.ZLTextParagraph; +import org.geometerplus.zlibrary.text.model.impl.ZLTextForcedControlEntry; +import org.geometerplus.zlibrary.text.model.impl.ZLModelFactory; public class TestZLTextModel extends TestCase { private ZLModelFactory factory = new ZLModelFactory(); diff --git a/test/org/test/zlibrary/options/ConfigIOTests.java b/test/org/test/zlibrary/options/ConfigIOTests.java index 41eb9ea26..bba2bd9a2 100644 --- a/test/org/test/zlibrary/options/ConfigIOTests.java +++ b/test/org/test/zlibrary/options/ConfigIOTests.java @@ -2,8 +2,8 @@ package org.test.zlibrary.options; import java.io.File; -import org.zlibrary.core.options.*; -import org.zlibrary.core.config.ZLConfigManager; +import org.geometerplus.zlibrary.core.options.*; +import org.geometerplus.zlibrary.core.config.ZLConfigManager; /** * содержит тесты на ZLConfigReader diff --git a/test/org/test/zlibrary/options/UtilTests.java b/test/org/test/zlibrary/options/UtilTests.java index b48413372..b90d33acb 100644 --- a/test/org/test/zlibrary/options/UtilTests.java +++ b/test/org/test/zlibrary/options/UtilTests.java @@ -1,6 +1,6 @@ package org.test.zlibrary.options; -import org.zlibrary.core.util.*; +import org.geometerplus.zlibrary.core.util.*; /** * тесты на Util часть, где лежат всякие вспомогательные сущности тесты 01 - это diff --git a/test/org/test/zlibrary/options/ZLBoolean3OptionTests1.java b/test/org/test/zlibrary/options/ZLBoolean3OptionTests1.java index 4e8466c8d..25442c26f 100644 --- a/test/org/test/zlibrary/options/ZLBoolean3OptionTests1.java +++ b/test/org/test/zlibrary/options/ZLBoolean3OptionTests1.java @@ -1,8 +1,8 @@ package org.test.zlibrary.options; -import org.zlibrary.core.util.ZLBoolean3; -import org.zlibrary.core.options.ZLBoolean3Option; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.util.ZLBoolean3; +import org.geometerplus.zlibrary.core.options.ZLBoolean3Option; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLBoolean3OptionTests1 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLBoolean3OptionTests2.java b/test/org/test/zlibrary/options/ZLBoolean3OptionTests2.java index bdd291213..de7c27fb8 100644 --- a/test/org/test/zlibrary/options/ZLBoolean3OptionTests2.java +++ b/test/org/test/zlibrary/options/ZLBoolean3OptionTests2.java @@ -1,8 +1,8 @@ package org.test.zlibrary.options; -import org.zlibrary.core.util.ZLBoolean3; -import org.zlibrary.core.options.ZLBoolean3Option; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.util.ZLBoolean3; +import org.geometerplus.zlibrary.core.options.ZLBoolean3Option; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLBoolean3OptionTests2 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLBooleanOptionTests1.java b/test/org/test/zlibrary/options/ZLBooleanOptionTests1.java index c21cd5c00..785afaa40 100644 --- a/test/org/test/zlibrary/options/ZLBooleanOptionTests1.java +++ b/test/org/test/zlibrary/options/ZLBooleanOptionTests1.java @@ -1,7 +1,7 @@ package org.test.zlibrary.options; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLBooleanOptionTests1 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLBooleanOptionTests2.java b/test/org/test/zlibrary/options/ZLBooleanOptionTests2.java index cacd17617..dceea1ba8 100644 --- a/test/org/test/zlibrary/options/ZLBooleanOptionTests2.java +++ b/test/org/test/zlibrary/options/ZLBooleanOptionTests2.java @@ -1,7 +1,7 @@ package org.test.zlibrary.options; -import org.zlibrary.core.options.ZLBooleanOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.options.ZLBooleanOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLBooleanOptionTests2 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLColorOptionTests1.java b/test/org/test/zlibrary/options/ZLColorOptionTests1.java index 9ddeeeab1..6b7f16da7 100644 --- a/test/org/test/zlibrary/options/ZLColorOptionTests1.java +++ b/test/org/test/zlibrary/options/ZLColorOptionTests1.java @@ -1,8 +1,8 @@ package org.test.zlibrary.options; -import org.zlibrary.core.util.ZLColor; -import org.zlibrary.core.options.ZLColorOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.options.ZLColorOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLColorOptionTests1 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLColorOptionTests2.java b/test/org/test/zlibrary/options/ZLColorOptionTests2.java index 1931ad7e8..80098b50b 100644 --- a/test/org/test/zlibrary/options/ZLColorOptionTests2.java +++ b/test/org/test/zlibrary/options/ZLColorOptionTests2.java @@ -1,8 +1,8 @@ package org.test.zlibrary.options; -import org.zlibrary.core.util.ZLColor; -import org.zlibrary.core.options.ZLColorOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.util.ZLColor; +import org.geometerplus.zlibrary.core.options.ZLColorOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLColorOptionTests2 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLConfigWriterTests.java b/test/org/test/zlibrary/options/ZLConfigWriterTests.java index 23077f574..cf851c996 100644 --- a/test/org/test/zlibrary/options/ZLConfigWriterTests.java +++ b/test/org/test/zlibrary/options/ZLConfigWriterTests.java @@ -5,7 +5,7 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import org.zlibrary.core.config.ZLConfigManager; +import org.geometerplus.zlibrary.core.config.ZLConfigManager; /** * тесты после 3-го - на запись дельты diff --git a/test/org/test/zlibrary/options/ZLIntegerOptionTests1.java b/test/org/test/zlibrary/options/ZLIntegerOptionTests1.java index 9dfab5da3..b09075e87 100644 --- a/test/org/test/zlibrary/options/ZLIntegerOptionTests1.java +++ b/test/org/test/zlibrary/options/ZLIntegerOptionTests1.java @@ -1,7 +1,7 @@ package org.test.zlibrary.options; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLIntegerOptionTests1 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLIntegerOptionTests2.java b/test/org/test/zlibrary/options/ZLIntegerOptionTests2.java index ef0433f54..cbddd8a33 100644 --- a/test/org/test/zlibrary/options/ZLIntegerOptionTests2.java +++ b/test/org/test/zlibrary/options/ZLIntegerOptionTests2.java @@ -1,7 +1,7 @@ package org.test.zlibrary.options; -import org.zlibrary.core.options.ZLIntegerOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.options.ZLIntegerOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLIntegerOptionTests2 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLIntegerRangeOptionTests1.java b/test/org/test/zlibrary/options/ZLIntegerRangeOptionTests1.java index 7e85af37b..72507703f 100644 --- a/test/org/test/zlibrary/options/ZLIntegerRangeOptionTests1.java +++ b/test/org/test/zlibrary/options/ZLIntegerRangeOptionTests1.java @@ -1,7 +1,7 @@ package org.test.zlibrary.options; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLIntegerRangeOptionTests1 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLIntegerRangeOptionTests2.java b/test/org/test/zlibrary/options/ZLIntegerRangeOptionTests2.java index 40569cc17..1fc088b0b 100644 --- a/test/org/test/zlibrary/options/ZLIntegerRangeOptionTests2.java +++ b/test/org/test/zlibrary/options/ZLIntegerRangeOptionTests2.java @@ -1,7 +1,7 @@ package org.test.zlibrary.options; -import org.zlibrary.core.options.ZLIntegerRangeOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLIntegerRangeOptionTests2 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLOptionTests.java b/test/org/test/zlibrary/options/ZLOptionTests.java index 7bdc7d906..57c6e0fe0 100644 --- a/test/org/test/zlibrary/options/ZLOptionTests.java +++ b/test/org/test/zlibrary/options/ZLOptionTests.java @@ -2,9 +2,9 @@ package org.test.zlibrary.options; import junit.framework.TestCase; -import org.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; -import org.zlibrary.core.config.ZLConfig; -import org.zlibrary.core.xmlconfig.ZLXMLConfigManager; +import org.geometerplus.zlibrary.core.xml.own.ZLOwnXMLProcessorFactory; +import org.geometerplus.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.xmlconfig.ZLXMLConfigManager; abstract class ZLOptionTests extends TestCase { ZLOptionTests(String inputPath, String outputPath) { diff --git a/test/org/test/zlibrary/options/ZLStringOptionTests1.java b/test/org/test/zlibrary/options/ZLStringOptionTests1.java index 5e51bd0a3..ad0a8b0db 100644 --- a/test/org/test/zlibrary/options/ZLStringOptionTests1.java +++ b/test/org/test/zlibrary/options/ZLStringOptionTests1.java @@ -1,7 +1,7 @@ package org.test.zlibrary.options; -import org.zlibrary.core.options.ZLStringOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLStringOptionTests1 extends ZLOptionTests { diff --git a/test/org/test/zlibrary/options/ZLStringOptionTests2.java b/test/org/test/zlibrary/options/ZLStringOptionTests2.java index 81137b53d..4a4f871ae 100644 --- a/test/org/test/zlibrary/options/ZLStringOptionTests2.java +++ b/test/org/test/zlibrary/options/ZLStringOptionTests2.java @@ -1,7 +1,7 @@ package org.test.zlibrary.options; -import org.zlibrary.core.options.ZLStringOption; -import org.zlibrary.core.config.ZLConfig; +import org.geometerplus.zlibrary.core.options.ZLStringOption; +import org.geometerplus.zlibrary.core.config.ZLConfig; public class ZLStringOptionTests2 extends ZLOptionTests {