diff --git a/data/formats/fb2/FBReaderVersion.ent b/data/formats/fb2/FBReaderVersion.ent index f02397771..556350e1b 100644 --- a/data/formats/fb2/FBReaderVersion.ent +++ b/data/formats/fb2/FBReaderVersion.ent @@ -1 +1 @@ - + diff --git a/platform/android/AndroidManifest.xml b/platform/android/AndroidManifest.xml index a565f436d..61515040f 100644 --- a/platform/android/AndroidManifest.xml +++ b/platform/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/platform/android/src/org/geometerplus/android/fbreader/AuthorItem.java b/platform/android/src/org/geometerplus/android/fbreader/AuthorItem.java index 6f62a3305..0d3109d3b 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/AuthorItem.java +++ b/platform/android/src/org/geometerplus/android/fbreader/AuthorItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/BookDownloader.java b/platform/android/src/org/geometerplus/android/fbreader/BookDownloader.java index 77ab2c794..4aceaedb2 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/BookDownloader.java +++ b/platform/android/src/org/geometerplus/android/fbreader/BookDownloader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/BookItem.java b/platform/android/src/org/geometerplus/android/fbreader/BookItem.java index 0e442f2bd..7bc80146a 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/BookItem.java +++ b/platform/android/src/org/geometerplus/android/fbreader/BookItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/FBReader.java b/platform/android/src/org/geometerplus/android/fbreader/FBReader.java index 283ec20e1..c0f2052cc 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/FBReader.java +++ b/platform/android/src/org/geometerplus/android/fbreader/FBReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/LibraryListAdapter.java b/platform/android/src/org/geometerplus/android/fbreader/LibraryListAdapter.java index 196f1d55f..7534dcdd7 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/LibraryListAdapter.java +++ b/platform/android/src/org/geometerplus/android/fbreader/LibraryListAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/LibraryListItem.java b/platform/android/src/org/geometerplus/android/fbreader/LibraryListItem.java index ae1972324..f0b770263 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/LibraryListItem.java +++ b/platform/android/src/org/geometerplus/android/fbreader/LibraryListItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java b/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java index b783d6010..41222ecfb 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java +++ b/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/LibraryTabUtil.java b/platform/android/src/org/geometerplus/android/fbreader/LibraryTabUtil.java index 0ac98d344..481ad59c2 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/LibraryTabUtil.java +++ b/platform/android/src/org/geometerplus/android/fbreader/LibraryTabUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/SeriesItem.java b/platform/android/src/org/geometerplus/android/fbreader/SeriesItem.java index bb1fe7e6a..d8c9fc026 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/SeriesItem.java +++ b/platform/android/src/org/geometerplus/android/fbreader/SeriesItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/android/fbreader/TagItem.java b/platform/android/src/org/geometerplus/android/fbreader/TagItem.java index 1d331d7ca..19aa691d2 100644 --- a/platform/android/src/org/geometerplus/android/fbreader/TagItem.java +++ b/platform/android/src/org/geometerplus/android/fbreader/TagItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java b/platform/android/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java index 12cecffe6..1bc28fc7a 100644 --- a/platform/android/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java +++ b/platform/android/src/org/geometerplus/zlibrary/core/sqliteconfig/ZLSQLiteConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java index e9526d3e0..ee6b6b414 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/AndroidDialog.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/AndroidDialog.java index 096de03e1..6787ba714 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/AndroidDialog.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/AndroidDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/DialogActivity.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/DialogActivity.java index 45d926020..5a042603a 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/DialogActivity.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/DialogActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java index 1a8a621fb..c891aa126 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBoolean3OptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java index ddc17e32f..2045e5c92 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidBooleanOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java index 47dfe8cd1..ea7894483 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidChoiceOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java index 02c4b02e2..3a6f24de8 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidColorOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java index 961c8d7cd..774b78bab 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidComboOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialog.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialog.java index 5dd7573b9..561afc04d 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialog.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java index a5e8a79b9..3edf34a85 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContentAsInterface.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContentAsInterface.java index b363b38f4..93ed9f8b5 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContentAsInterface.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContentAsInterface.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContentWithFooter.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContentWithFooter.java index 4c4290901..02b8eb99e 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContentWithFooter.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogContentWithFooter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogInterface.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogInterface.java index 9005688b2..1f7a637b2 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogInterface.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogInterface.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java index 5e81a0126..7be2d3a2b 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidKeyOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidKeyOptionView.java index cc1f31e43..c02818473 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidKeyOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidKeyOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java index 0a1462cd5..902a42cd4 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java index 4191b4ee1..46f840b96 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsTab.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsTab.java index 138c599d5..bc5d0fe1d 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsTab.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidOptionsTab.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.zlibrary.ui.android.dialogs; import java.util.ArrayList; diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java index c8dd08ac1..95b3ce89d 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidSpinOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java index a9412c160..f18b9133a 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidStringOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java index 072bbe814..d34986afb 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java index 977d8f747..0f56db30b 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/image/ZLAndroidImageManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java index 1f58b9a80..fa8aecfa0 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java index 5d9eb8ceb..c0e2a7205 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java index fea73245b..81097896d 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -92,4 +92,8 @@ public final class ZLAndroidLibrary extends ZLibrary { intent.setData(Uri.parse(reference)); myActivity.startActivity(intent); } + + //public String getVersionName() { + // return myApplication.getResources().getString(android.R.attr.versionName); + //} } diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java index 0aab4a149..0c789437e 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidKeyUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java index c04683149..fc8d3ade6 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java index 1d0f7adcf..eb1b96172 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidViewWidget.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java index 9e87f7d78..6c886b25a 100644 --- a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java +++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/java/util/zip/ZipEntry.java b/platform/j2me/src/java/util/zip/ZipEntry.java index 72f4d8baa..3d56459d7 100644 --- a/platform/j2me/src/java/util/zip/ZipEntry.java +++ b/platform/j2me/src/java/util/zip/ZipEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/java/util/zip/ZipException.java b/platform/j2me/src/java/util/zip/ZipException.java index 352a5f368..c80bb30a1 100644 --- a/platform/j2me/src/java/util/zip/ZipException.java +++ b/platform/j2me/src/java/util/zip/ZipException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/java/util/zip/ZipFile.java b/platform/j2me/src/java/util/zip/ZipFile.java index 25b3c1594..85d85c78e 100644 --- a/platform/j2me/src/java/util/zip/ZipFile.java +++ b/platform/j2me/src/java/util/zip/ZipFile.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/java/util/zip/ZipInputStream.java b/platform/j2me/src/java/util/zip/ZipInputStream.java index 3392f7535..0a0265d34 100644 --- a/platform/j2me/src/java/util/zip/ZipInputStream.java +++ b/platform/j2me/src/java/util/zip/ZipInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/org/zlibrary/core/util/ArrayList.java b/platform/j2me/src/org/zlibrary/core/util/ArrayList.java index f9b2c7b4f..04fca67b0 100644 --- a/platform/j2me/src/org/zlibrary/core/util/ArrayList.java +++ b/platform/j2me/src/org/zlibrary/core/util/ArrayList.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/org/zlibrary/core/util/Collections.java b/platform/j2me/src/org/zlibrary/core/util/Collections.java index a750a9e95..4df2e0963 100644 --- a/platform/j2me/src/org/zlibrary/core/util/Collections.java +++ b/platform/j2me/src/org/zlibrary/core/util/Collections.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/org/zlibrary/core/util/Comparator.java b/platform/j2me/src/org/zlibrary/core/util/Comparator.java index 67f712b97..9a5b1d5b4 100644 --- a/platform/j2me/src/org/zlibrary/core/util/Comparator.java +++ b/platform/j2me/src/org/zlibrary/core/util/Comparator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/org/zlibrary/core/util/File.java b/platform/j2me/src/org/zlibrary/core/util/File.java index 556a35b2a..3a2e0473f 100644 --- a/platform/j2me/src/org/zlibrary/core/util/File.java +++ b/platform/j2me/src/org/zlibrary/core/util/File.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/org/zlibrary/core/util/HashMap.java b/platform/j2me/src/org/zlibrary/core/util/HashMap.java index 48348a0ac..4bd02480e 100644 --- a/platform/j2me/src/org/zlibrary/core/util/HashMap.java +++ b/platform/j2me/src/org/zlibrary/core/util/HashMap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/j2me/src/org/zlibrary/core/util/Locale.java b/platform/j2me/src/org/zlibrary/core/util/Locale.java index 890b1c8af..dfcd2095b 100644 --- a/platform/j2me/src/org/zlibrary/core/util/Locale.java +++ b/platform/j2me/src/org/zlibrary/core/util/Locale.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 0089d8b2f..d28cfb641 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/application/ZLJ2MEApplicationWindow.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/application/ZLJ2MEApplicationWindow.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 20c1a564d..e5d74f3ce 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfig.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 6407944d0..3214cce73 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfigManager.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/config/ZLJ2MEConfigManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 e5fc26d35..d029a6add 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageData.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 a4c3b9e82..181675f38 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageManager.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/image/ZLJ2MEImageManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 553e68658..c39a260d8 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLJ2MELibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 1460b264a..8066bf60a 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLMIDlet.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/library/ZLMIDlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 1eb128e46..6c5e7c1e8 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLCanvas.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLCanvas.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 4637d6a7a..e65859afc 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEPaintContext.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEPaintContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by 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 42475f431..21ea01a1e 100644 --- a/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEViewWidget.java +++ b/platform/j2me/src/org/zlibrary/ui/j2me/view/ZLJ2MEViewWidget.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigImpl.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigImpl.java index e7acdac28..65c1adf7e 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigImpl.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigReader.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigReader.java index 20a93db89..65712d71b 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigReader.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigWriter.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigWriter.java index 61df530ce..8c5bf0d1c 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigWriter.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLConfigWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java index 9feb108af..d26263c6c 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeletedValuesSet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeltaConfig.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeltaConfig.java index 606dafe96..17b3afeaf 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeltaConfig.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLDeltaConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLGroup.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLGroup.java index c800e98c5..d73f5389f 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLGroup.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionID.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionID.java index de8321312..18e4b12dd 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionID.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionID.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionInfo.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionInfo.java index 217d124a8..b300a59d7 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionInfo.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLOptionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLReader.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLReader.java index da644a567..b19c4b2ab 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLReader.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLSimpleConfig.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLSimpleConfig.java index d3581c637..098a5790a 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLSimpleConfig.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLSimpleConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLWriter.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLWriter.java index affa470d7..0f657c437 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLWriter.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLXMLConfigManager.java b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLXMLConfigManager.java index f1fa1d492..7749cda48 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLXMLConfigManager.java +++ b/platform/swing/src/org/geometerplus/zlibrary/core/xmlconfig/ZLXMLConfigManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java index a42b50df0..a1d7de694 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/application/ZLSwingApplicationWindow.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java index 242e667c3..456c9e898 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBoolean3OptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java index 3243be21d..c458c9806 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLBooleanOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java index 3a14b603d..02efbb0ec 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLChoiceOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLColorOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLColorOptionView.java index 1811ce638..6ab326fbf 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLColorOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLColorOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLComboOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLComboOptionView.java index 6f8c97cd9..d8229467f 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLComboOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLComboOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java index c12d4f12e..50db66f11 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLKeyOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java index 51bd91991..3d2979e79 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSpinOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLStringOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLStringOptionView.java index 0bc88f4ef..b4e7d1d44 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLStringOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLStringOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialog.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialog.java index 13238b610..803ab0ffe 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialog.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java index 90133337e..5ea361e1c 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogContent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java index e3135aa95..7c7c61a07 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingDialogManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java index 8c45a557c..3d8d9230e 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java index d85c29b88..79b7ce748 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingOptionsDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java index 99c5e4264..a00b6e40c 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/dialogs/ZLSwingSelectionDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageData.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageData.java index cefd0b3a5..9a05affb3 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageData.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageManager.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageManager.java index f3a9ea5cd..19491028c 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageManager.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/image/ZLSwingImageManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/Main.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/Main.java index 22302c16a..624c4a3ef 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/Main.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/ZLSwingLibrary.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/ZLSwingLibrary.java index 1bbee5437..5eaac0060 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/ZLSwingLibrary.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/library/ZLSwingLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/util/ZLSwingIconUtil.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/util/ZLSwingIconUtil.java index fd63cb4ab..34f18d82d 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/util/ZLSwingIconUtil.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/util/ZLSwingIconUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingPaintContext.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingPaintContext.java index 1a6876357..a4369ccb4 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingPaintContext.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingPaintContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingViewWidget.java b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingViewWidget.java index 36e470c1b..74e69a6c2 100644 --- a/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingViewWidget.java +++ b/platform/swing/src/org/geometerplus/zlibrary/ui/swing/view/ZLSwingViewWidget.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/bookmodel/BookModel.java b/src/org/geometerplus/fbreader/bookmodel/BookModel.java index 931ee7e15..5ce108919 100644 --- a/src/org/geometerplus/fbreader/bookmodel/BookModel.java +++ b/src/org/geometerplus/fbreader/bookmodel/BookModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,10 +31,10 @@ import org.geometerplus.fbreader.formats.*; public final class BookModel { public final BookDescription Description; - public final ZLTextPlainModel BookTextModel = new ZLTextPlainModel(65536); + public final ZLTextPlainModel BookTextModel = new ZLTextPlainModel(65536, "/sdcard/Books/.FBReader", "cache"); public final ContentsModel ContentsModel = new ContentsModel(); - private final HashMap myFootnotes = new HashMap(); + private final HashMap myFootnotes = new HashMap(); private final HashMap myInternalHyperlinks = new HashMap(); private final ArrayList myBookTextModels; @@ -65,8 +65,8 @@ public final class BookModel { } ZLTextPlainModel getFootnoteModel(String id) { - final HashMap footnotes = myFootnotes; - ZLTextPlainModel model = (ZLTextPlainModel)footnotes.get(id); + final HashMap footnotes = myFootnotes; + ZLTextPlainModel model = footnotes.get(id); if (model == null) { model = new ZLTextPlainModel(4096); footnotes.put(id, model); @@ -99,9 +99,8 @@ public final class BookModel { myImageMap.put(id, image); } - // public ZLTextPlainModel addBookTextModel() { - ZLTextPlainModel bookTextModel = new ZLTextPlainModel(65536); + ZLTextPlainModel bookTextModel = new ZLTextPlainModel(65536, "/sdcard/Books/.FBReader", "cache" + myBookTextModels.size()); myBookTextModels.add(bookTextModel); return bookTextModel; } diff --git a/src/org/geometerplus/fbreader/bookmodel/BookReader.java b/src/org/geometerplus/fbreader/bookmodel/BookReader.java index 3b5aace8d..1ab42d194 100644 --- a/src/org/geometerplus/fbreader/bookmodel/BookReader.java +++ b/src/org/geometerplus/fbreader/bookmodel/BookReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/bookmodel/ContentsModel.java b/src/org/geometerplus/fbreader/bookmodel/ContentsModel.java index 9df5cbf2a..b6b8cdc0a 100644 --- a/src/org/geometerplus/fbreader/bookmodel/ContentsModel.java +++ b/src/org/geometerplus/fbreader/bookmodel/ContentsModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/bookmodel/FBTextKind.java b/src/org/geometerplus/fbreader/bookmodel/FBTextKind.java index 60370d75d..6baf5cb9e 100644 --- a/src/org/geometerplus/fbreader/bookmodel/FBTextKind.java +++ b/src/org/geometerplus/fbreader/bookmodel/FBTextKind.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/collection/BookCollection.java b/src/org/geometerplus/fbreader/collection/BookCollection.java index 6e1525ba7..913316cfd 100644 --- a/src/org/geometerplus/fbreader/collection/BookCollection.java +++ b/src/org/geometerplus/fbreader/collection/BookCollection.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/collection/RecentBooks.java b/src/org/geometerplus/fbreader/collection/RecentBooks.java index 752f229ba..4b25c3d7a 100644 --- a/src/org/geometerplus/fbreader/collection/RecentBooks.java +++ b/src/org/geometerplus/fbreader/collection/RecentBooks.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/constants/XMLNamespace.java b/src/org/geometerplus/fbreader/constants/XMLNamespace.java new file mode 100644 index 000000000..02563b418 --- /dev/null +++ b/src/org/geometerplus/fbreader/constants/XMLNamespace.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +package org.geometerplus.fbreader.constants; + +public interface XMLNamespace { + String DublinCorePrefix = "http://purl.org/dc/elements"; + String DublinCoreLegacyPrefix = "http://purl.org/metadata/dublin_core"; + String XLink = "http://www.w3.org/1999/xlink"; + String OpenPackagingFormat = "http://www.idpf.org/2007/opf"; +} diff --git a/src/org/geometerplus/fbreader/description/Author.java b/src/org/geometerplus/fbreader/description/Author.java index ccb3d3f4e..064dbb34e 100644 --- a/src/org/geometerplus/fbreader/description/Author.java +++ b/src/org/geometerplus/fbreader/description/Author.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/description/BookDescription.java b/src/org/geometerplus/fbreader/description/BookDescription.java index 0157ac9b7..b135ec0bc 100644 --- a/src/org/geometerplus/fbreader/description/BookDescription.java +++ b/src/org/geometerplus/fbreader/description/BookDescription.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -63,6 +63,7 @@ public class BookDescription implements Comparable { ourDescriptions.put(fileName, description); } if (!checkFile || BookDescriptionUtil.checkInfo(file)) { + //if (false) { BookInfo info = new BookInfo(fileName); description.myAuthor = new Author(info.AuthorDisplayNameOption.getValue(), info.AuthorSortKeyOption.getValue()); description.myTitle = info.TitleOption.getValue(); diff --git a/src/org/geometerplus/fbreader/description/BookDescriptionUtil.java b/src/org/geometerplus/fbreader/description/BookDescriptionUtil.java index 0530f263a..d51a8fc76 100644 --- a/src/org/geometerplus/fbreader/description/BookDescriptionUtil.java +++ b/src/org/geometerplus/fbreader/description/BookDescriptionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/encoding/DummyEncodingConverterProvider.java b/src/org/geometerplus/fbreader/encoding/DummyEncodingConverterProvider.java index 791d408be..e7ea677b2 100644 --- a/src/org/geometerplus/fbreader/encoding/DummyEncodingConverterProvider.java +++ b/src/org/geometerplus/fbreader/encoding/DummyEncodingConverterProvider.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.fbreader.encoding; public class DummyEncodingConverterProvider extends ZLEncodingConverterProvider { diff --git a/src/org/geometerplus/fbreader/encoding/MyEncodingConverterProvider.java b/src/org/geometerplus/fbreader/encoding/MyEncodingConverterProvider.java index f570c3fde..c73cf2050 100644 --- a/src/org/geometerplus/fbreader/encoding/MyEncodingConverterProvider.java +++ b/src/org/geometerplus/fbreader/encoding/MyEncodingConverterProvider.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.fbreader.encoding; public class MyEncodingConverterProvider extends ZLEncodingConverterProvider { diff --git a/src/org/geometerplus/fbreader/encoding/ZLEncodingCollection.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingCollection.java index ae0435472..330e38276 100644 --- a/src/org/geometerplus/fbreader/encoding/ZLEncodingCollection.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingCollection.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/encoding/ZLEncodingConverter.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverter.java index 28ed690cc..3956597a3 100644 --- a/src/org/geometerplus/fbreader/encoding/ZLEncodingConverter.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterInfo.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterInfo.java index 338627c7d..7de94ce66 100644 --- a/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterInfo.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterProvider.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterProvider.java index 129f77d6d..7eaa2c721 100644 --- a/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterProvider.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingConverterProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/encoding/ZLEncodingSet.java b/src/org/geometerplus/fbreader/encoding/ZLEncodingSet.java index 684f7bca9..069526b53 100644 --- a/src/org/geometerplus/fbreader/encoding/ZLEncodingSet.java +++ b/src/org/geometerplus/fbreader/encoding/ZLEncodingSet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/encodingOption/EncodingEntry.java b/src/org/geometerplus/fbreader/encodingOption/EncodingEntry.java index 4c28dffc5..b9be36add 100644 --- a/src/org/geometerplus/fbreader/encodingOption/EncodingEntry.java +++ b/src/org/geometerplus/fbreader/encodingOption/EncodingEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/encodingOption/EncodingSetEntry.java b/src/org/geometerplus/fbreader/encodingOption/EncodingSetEntry.java index 10441a6f3..48093315b 100644 --- a/src/org/geometerplus/fbreader/encodingOption/EncodingSetEntry.java +++ b/src/org/geometerplus/fbreader/encodingOption/EncodingSetEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ActionCode.java b/src/org/geometerplus/fbreader/fbreader/ActionCode.java index 9915da791..c4dad687c 100644 --- a/src/org/geometerplus/fbreader/fbreader/ActionCode.java +++ b/src/org/geometerplus/fbreader/fbreader/ActionCode.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/BookInfoDialog.java b/src/org/geometerplus/fbreader/fbreader/BookInfoDialog.java index 8cdfbd020..8379790ad 100644 --- a/src/org/geometerplus/fbreader/fbreader/BookInfoDialog.java +++ b/src/org/geometerplus/fbreader/fbreader/BookInfoDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/BookTextView.java b/src/org/geometerplus/fbreader/fbreader/BookTextView.java index 2fddbc7f3..c13aafe21 100644 --- a/src/org/geometerplus/fbreader/fbreader/BookTextView.java +++ b/src/org/geometerplus/fbreader/fbreader/BookTextView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/CancelAction.java b/src/org/geometerplus/fbreader/fbreader/CancelAction.java index d2bef7ee3..ef3154434 100644 --- a/src/org/geometerplus/fbreader/fbreader/CancelAction.java +++ b/src/org/geometerplus/fbreader/fbreader/CancelAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java b/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java index bb97a431c..002f2c520 100644 --- a/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ChangeFontSizeAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ContentsView.java b/src/org/geometerplus/fbreader/fbreader/ContentsView.java index 6abd52edd..c202c8d8f 100644 --- a/src/org/geometerplus/fbreader/fbreader/ContentsView.java +++ b/src/org/geometerplus/fbreader/fbreader/ContentsView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/DummyAction.java b/src/org/geometerplus/fbreader/fbreader/DummyAction.java index d49c5218b..74a7589ad 100644 --- a/src/org/geometerplus/fbreader/fbreader/DummyAction.java +++ b/src/org/geometerplus/fbreader/fbreader/DummyAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/FBAction.java b/src/org/geometerplus/fbreader/fbreader/FBAction.java index 0d34cd980..adb99994f 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FBAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/FBReader.java b/src/org/geometerplus/fbreader/fbreader/FBReader.java index 8bcbb5cae..5a6799fce 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBReader.java +++ b/src/org/geometerplus/fbreader/fbreader/FBReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/FBView.java b/src/org/geometerplus/fbreader/fbreader/FBView.java index 6ca7ee06e..695638242 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBView.java +++ b/src/org/geometerplus/fbreader/fbreader/FBView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/FindNextAction.java b/src/org/geometerplus/fbreader/fbreader/FindNextAction.java index 95d41b1eb..87260c723 100644 --- a/src/org/geometerplus/fbreader/fbreader/FindNextAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FindNextAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java b/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java index a053e7b4e..08c4e8d83 100644 --- a/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java +++ b/src/org/geometerplus/fbreader/fbreader/FindPreviousAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/FootnoteView.java b/src/org/geometerplus/fbreader/fbreader/FootnoteView.java index c16a52d39..41f099493 100644 --- a/src/org/geometerplus/fbreader/fbreader/FootnoteView.java +++ b/src/org/geometerplus/fbreader/fbreader/FootnoteView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/QuitAction.java b/src/org/geometerplus/fbreader/fbreader/QuitAction.java index f2d24f4df..a3dca1fdb 100644 --- a/src/org/geometerplus/fbreader/fbreader/QuitAction.java +++ b/src/org/geometerplus/fbreader/fbreader/QuitAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/RedoAction.java b/src/org/geometerplus/fbreader/fbreader/RedoAction.java index 88f6c8033..aea1d898b 100644 --- a/src/org/geometerplus/fbreader/fbreader/RedoAction.java +++ b/src/org/geometerplus/fbreader/fbreader/RedoAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ScrollToHomeAction.java b/src/org/geometerplus/fbreader/fbreader/ScrollToHomeAction.java index a25ca9c58..a0865ccda 100644 --- a/src/org/geometerplus/fbreader/fbreader/ScrollToHomeAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ScrollToHomeAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ScrollingAction.java b/src/org/geometerplus/fbreader/fbreader/ScrollingAction.java index 398aff83f..9c06992ba 100644 --- a/src/org/geometerplus/fbreader/fbreader/ScrollingAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ScrollingAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ScrollingOptions.java b/src/org/geometerplus/fbreader/fbreader/ScrollingOptions.java index d94707dbf..400c0e964 100644 --- a/src/org/geometerplus/fbreader/fbreader/ScrollingOptions.java +++ b/src/org/geometerplus/fbreader/fbreader/ScrollingOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/SearchAction.java b/src/org/geometerplus/fbreader/fbreader/SearchAction.java index 35525b3bd..aa2d2838e 100644 --- a/src/org/geometerplus/fbreader/fbreader/SearchAction.java +++ b/src/org/geometerplus/fbreader/fbreader/SearchAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/SearchPatternEntry.java b/src/org/geometerplus/fbreader/fbreader/SearchPatternEntry.java index 0ecda9767..cae59eca5 100644 --- a/src/org/geometerplus/fbreader/fbreader/SearchPatternEntry.java +++ b/src/org/geometerplus/fbreader/fbreader/SearchPatternEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/SetModeAction.java b/src/org/geometerplus/fbreader/fbreader/SetModeAction.java index 30d15ed74..13c0f3aaa 100644 --- a/src/org/geometerplus/fbreader/fbreader/SetModeAction.java +++ b/src/org/geometerplus/fbreader/fbreader/SetModeAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ShowBookInfoDialogAction.java b/src/org/geometerplus/fbreader/fbreader/ShowBookInfoDialogAction.java index ffe7adabc..77c1c99a7 100644 --- a/src/org/geometerplus/fbreader/fbreader/ShowBookInfoDialogAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowBookInfoDialogAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ShowContentsAction.java b/src/org/geometerplus/fbreader/fbreader/ShowContentsAction.java index 4d2167d60..057126a31 100644 --- a/src/org/geometerplus/fbreader/fbreader/ShowContentsAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowContentsAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ShowHelpAction.java b/src/org/geometerplus/fbreader/fbreader/ShowHelpAction.java index 3103cf6d6..ab89e31bd 100644 --- a/src/org/geometerplus/fbreader/fbreader/ShowHelpAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowHelpAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ShowLibrary.java b/src/org/geometerplus/fbreader/fbreader/ShowLibrary.java index 733900f69..a018af866 100644 --- a/src/org/geometerplus/fbreader/fbreader/ShowLibrary.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/ShowOptionsDialogAction.java b/src/org/geometerplus/fbreader/fbreader/ShowOptionsDialogAction.java index eb88abd39..f715b6ed7 100644 --- a/src/org/geometerplus/fbreader/fbreader/ShowOptionsDialogAction.java +++ b/src/org/geometerplus/fbreader/fbreader/ShowOptionsDialogAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/fbreader/UndoAction.java b/src/org/geometerplus/fbreader/fbreader/UndoAction.java index 1543b693c..750beb63f 100644 --- a/src/org/geometerplus/fbreader/fbreader/UndoAction.java +++ b/src/org/geometerplus/fbreader/fbreader/UndoAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/EncodedTextReader.java b/src/org/geometerplus/fbreader/formats/EncodedTextReader.java index cb3a8a30d..2244427a8 100644 --- a/src/org/geometerplus/fbreader/formats/EncodedTextReader.java +++ b/src/org/geometerplus/fbreader/formats/EncodedTextReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/FormatPlugin.java b/src/org/geometerplus/fbreader/formats/FormatPlugin.java index fa6d348e1..0cd72be35 100644 --- a/src/org/geometerplus/fbreader/formats/FormatPlugin.java +++ b/src/org/geometerplus/fbreader/formats/FormatPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/PluginCollection.java b/src/org/geometerplus/fbreader/formats/PluginCollection.java index 0e73515fd..4c5732c54 100644 --- a/src/org/geometerplus/fbreader/formats/PluginCollection.java +++ b/src/org/geometerplus/fbreader/formats/PluginCollection.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java b/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java index 4747e3468..a926dcef7 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java +++ b/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2DescriptionReader.java b/src/org/geometerplus/fbreader/formats/fb2/FB2DescriptionReader.java index d647faed0..d915b88a1 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2DescriptionReader.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2DescriptionReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -222,6 +222,7 @@ public class FB2DescriptionReader extends ZLXMLReaderAdapter { public boolean readDocument(String fileName) { final ZLXMLProcessor processor = ZLXMLProcessorFactory.getInstance().createXMLProcessor(); + processor.setBufferSize(2048); return processor.read(this, fileName); } } diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java index 62271a206..74a70c40f 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java index 486aed2a6..585f81048 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -395,9 +395,11 @@ public final class FB2Reader extends BookReader implements ZLXMLReader { private static ArrayList ourExternalDTDs = new ArrayList(); public ArrayList externalDTDs() { + /* if (ourExternalDTDs.isEmpty()) { ourExternalDTDs.add(ZLibrary.JAR_DATA_PREFIX + "data/formats/fb2/FBReaderVersion.ent"); } + */ return ourExternalDTDs; } } diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java index c0212cf91..241962903 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Tag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java b/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java index 81eeb8d57..1914941ad 100644 --- a/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java +++ b/src/org/geometerplus/fbreader/formats/fb2/FB2TagManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlDescriptionReader.java b/src/org/geometerplus/fbreader/formats/html/HtmlDescriptionReader.java index c3dc6fc88..8f2a94d16 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlDescriptionReader.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlDescriptionReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java b/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java index ad36381f0..dc8ab158c 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlReader.java b/src/org/geometerplus/fbreader/formats/html/HtmlReader.java index 794baa570..8c79aefdd 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlReader.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/html/HtmlTag.java b/src/org/geometerplus/fbreader/formats/html/HtmlTag.java index 735ae2159..ef11fb06c 100644 --- a/src/org/geometerplus/fbreader/formats/html/HtmlTag.java +++ b/src/org/geometerplus/fbreader/formats/html/HtmlTag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/oeb/NCXReader.java b/src/org/geometerplus/fbreader/formats/oeb/NCXReader.java new file mode 100644 index 000000000..d5168da7d --- /dev/null +++ b/src/org/geometerplus/fbreader/formats/oeb/NCXReader.java @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +package org.geometerplus.fbreader.formats.oeb; + +import java.util.*; + +import org.geometerplus.zlibrary.core.xml.*; + +import org.geometerplus.fbreader.bookmodel.*; + +class NCXReader extends ZLXMLReaderAdapter { + static class NavPoint { + final int Order; + final int Level; + String Text; + String ContentHRef; + + /* + NavPoint() { + this(-1, -1); + } + */ + + NavPoint(int order, int level) { + Order = order; + Level = level; + } + } + + private final BookReader myModelReader; + private HashMap myNavigationMap; + private ArrayList myPointStack; + + private static final int READ_NONE = 0; + private static final int READ_MAP = 1; + private static final int READ_POINT = 2; + private static final int READ_LABEL = 3; + private static final int READ_TEXT = 4; + + int myReadState = READ_NONE; + int myPlayIndex = -65535; + + NCXReader(BookReader modelReader) { + myModelReader = modelReader; + } + + private static final String TAG_NAVMAP = "navmap"; + private static final String TAG_NAVPOINT = "navpoint"; + private static final String TAG_NAVLABEL = "navlabel"; + private static final String TAG_CONTENT = "content"; + private static final String TAG_TEXT = "text"; + + private static final String ATTRIBUTE_PLAYORDER = "playOrder"; + + public boolean startElementHandler(String tag, ZLStringMap attributes) { + tag = tag.toLowerCase().intern(); + switch (myReadState) { + case READ_NONE: + if (tag == TAG_NAVMAP) { + myReadState = READ_MAP; + } + break; + case READ_MAP: + if (tag == TAG_NAVPOINT) { + String order = attributes.getValue(ATTRIBUTE_PLAYORDER); + } + break; + case READ_POINT: + break; + case READ_LABEL: + break; + case READ_TEXT: + break; + } + return false; + } + + public boolean endElementHandler(String tag) { + return false; + } + + public void characterDataHandler(char[] ch, int start, int length) { + } +} diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java b/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java index 7fbfba97a..25f7ec1a2 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBBookReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ import org.geometerplus.zlibrary.core.image.ZLFileImage; import org.geometerplus.fbreader.bookmodel.*; import org.geometerplus.fbreader.formats.xhtml.XHTMLReader; +import org.geometerplus.fbreader.constants.XMLNamespace; class Reference { public final String Title; @@ -38,14 +39,16 @@ class Reference { } } -class OEBBookReader extends ZLXMLReaderAdapter { +class OEBBookReader extends ZLXMLReaderAdapter implements XMLNamespace { private final BookReader myModelReader; private final HashMap myIdToHref = new HashMap(); private final ArrayList myHtmlFileNames = new ArrayList(); private final ArrayList myTourTOC = new ArrayList(); private final ArrayList myGuideTOC = new ArrayList(); + private String myOPFSchemePrefix; private String myFilePrefix; + private String myNCXTOCFileName; OEBBookReader(BookModel model) { myModelReader = new BookReader(model); @@ -68,6 +71,7 @@ class OEBBookReader extends ZLXMLReaderAdapter { myIdToHref.clear(); myHtmlFileNames.clear(); + myNCXTOCFileName = null; myTourTOC.clear(); myGuideTOC.clear(); myState = READ_NONE; @@ -85,6 +89,18 @@ class OEBBookReader extends ZLXMLReaderAdapter { new XHTMLReader(myModelReader).readFile(myFilePrefix, name, name); } + generateTOC(); + + return true; + } + + private void generateTOC() { + if (myNCXTOCFileName != null) { + //NCXReader ncxReader = new NCXReader(myModelReader); + //if (ncxReader.read(myFilePrefix + myNCXTOCFileName)) { + //} + } + final ArrayList toc = myTourTOC.isEmpty() ? myGuideTOC : myTourTOC; final int tocLen = toc.size(); for (int i = 0; i < tocLen; ++i) { @@ -99,8 +115,6 @@ class OEBBookReader extends ZLXMLReaderAdapter { } } } - - return true; } private static final String MANIFEST = "manifest"; @@ -123,10 +137,15 @@ class OEBBookReader extends ZLXMLReaderAdapter { private int myState; public boolean startElementHandler(String tag, ZLStringMap xmlattributes) { - tag = tag.toLowerCase().intern(); + tag = tag.toLowerCase(); + if ((myOPFSchemePrefix != null) && tag.startsWith(myOPFSchemePrefix)) { + tag = tag.substring(myOPFSchemePrefix.length()); + } + tag = tag.intern(); if (MANIFEST == tag) { myState = READ_MANIFEST; } else if (SPINE == tag) { + myNCXTOCFileName = xmlattributes.getValue("toc"); myState = READ_SPINE; } else if (GUIDE == tag) { myState = READ_GUIDE; @@ -171,10 +190,27 @@ class OEBBookReader extends ZLXMLReaderAdapter { } public boolean endElementHandler(String tag) { - tag = tag.toLowerCase().intern(); + tag = tag.toLowerCase(); + if ((myOPFSchemePrefix != null) && tag.startsWith(myOPFSchemePrefix)) { + tag = tag.substring(myOPFSchemePrefix.length()); + } + tag = tag.intern(); if ((MANIFEST == tag) || (SPINE == tag) || (GUIDE == tag) || (TOUR == tag)) { myState = READ_NONE; } return false; } + + public boolean processNamespaces() { + return true; + } + + public void namespaceListChangedHandler(HashMap namespaces) { + myOPFSchemePrefix = null; + for (Object o : namespaces.keySet()) { + if (OpenPackagingFormat.equals(o)) { + myOPFSchemePrefix = namespaces.get(o) + ":"; + } + } + } } diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBDescriptionReader.java b/src/org/geometerplus/fbreader/formats/oeb/OEBDescriptionReader.java index d46f5ac74..6a2fe9b51 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBDescriptionReader.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBDescriptionReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,14 +23,18 @@ import java.util.*; import org.geometerplus.zlibrary.core.xml.*; import org.geometerplus.fbreader.description.BookDescription; +import org.geometerplus.fbreader.constants.XMLNamespace; -class OEBDescriptionReader extends ZLXMLReaderAdapter { +class OEBDescriptionReader extends ZLXMLReaderAdapter implements XMLNamespace { private final BookDescription.WritableBookDescription myDescription; - private String myDCMetadataTag; + private String myDCMetadataTag = "dc-metadata"; + private String myMetadataTag = "metadata"; + private String myMetadataTagRealName; private String myTitleTag; private String myAuthorTag; private String mySubjectTag; + private String myLanguageTag; private final ArrayList myAuthorList = new ArrayList(); private final ArrayList myAuthorList2 = new ArrayList(); @@ -45,7 +49,10 @@ class OEBDescriptionReader extends ZLXMLReaderAdapter { boolean readDescription(String fileName) { myReadMetaData = false; myReadState = READ_NONE; - if (!read(fileName)) { + + final ZLXMLProcessor processor = ZLXMLProcessorFactory.getInstance().createXMLProcessor(); + processor.setBufferSize(2048); + if (!processor.read(this, fileName)) { return false; } @@ -63,6 +70,7 @@ class OEBDescriptionReader extends ZLXMLReaderAdapter { private static final int READ_AUTHOR2 = 2; private static final int READ_TITLE = 3; private static final int READ_SUBJECT = 4; + private static final int READ_LANGUAGE = 5; private int myReadState; private boolean myReadMetaData; @@ -76,22 +84,27 @@ class OEBDescriptionReader extends ZLXMLReaderAdapter { myTitleTag = null; myAuthorTag = null; mySubjectTag = null; + myLanguageTag = null; + myMetadataTag = "metadata"; for (Object o : namespaces.keySet()) { final String id = (String)o; - if (id.startsWith("http://purl.org/dc/elements")) { + if (id.startsWith(DublinCorePrefix) || id.startsWith(DublinCoreLegacyPrefix)) { final String name = (String)namespaces.get(id); myTitleTag = (name + ":title").intern(); myAuthorTag = (name + ":creator").intern(); mySubjectTag = (name + ":subject").intern(); - break; + myLanguageTag = (name + ":language").intern(); + } else if (id.equals(OpenPackagingFormat)) { + final String name = (String)namespaces.get(id); + myMetadataTag = (name + ":metadata").intern(); } } } public boolean startElementHandler(String tag, ZLStringMap attributes) { tag = tag.toLowerCase().intern(); - if ((tag == "metadata") || (tag == "dc-metadata")) { - myDCMetadataTag = tag; + if ((tag == myMetadataTag) || (tag == myDCMetadataTag)) { + myMetadataTagRealName = tag; myReadMetaData = true; } else if (myReadMetaData) { if (tag == myTitleTag) { @@ -105,6 +118,8 @@ class OEBDescriptionReader extends ZLXMLReaderAdapter { } } else if (tag == mySubjectTag) { myReadState = READ_SUBJECT; + } else if (tag == myLanguageTag) { + myReadState = READ_LANGUAGE; } } return false; @@ -118,6 +133,7 @@ class OEBDescriptionReader extends ZLXMLReaderAdapter { case READ_AUTHOR2: case READ_TITLE: case READ_SUBJECT: + case READ_LANGUAGE: myBuffer.append(data, start, len); break; } @@ -125,11 +141,11 @@ class OEBDescriptionReader extends ZLXMLReaderAdapter { public boolean endElementHandler(String tag) { tag = tag.toLowerCase(); - if (myDCMetadataTag.equals(tag)) { + if (tag.equals(myMetadataTagRealName)) { return true; } - final String bufferContent = myBuffer.toString().trim(); + String bufferContent = myBuffer.toString().trim(); if (bufferContent.length() != 0) { switch (myReadState) { case READ_TITLE: @@ -144,6 +160,19 @@ class OEBDescriptionReader extends ZLXMLReaderAdapter { case READ_SUBJECT: myDescription.addTag(bufferContent, true); break; + case READ_LANGUAGE: + { + int index = bufferContent.indexOf('_'); + if (index >= 0) { + bufferContent = bufferContent.substring(0, index); + } + index = bufferContent.indexOf('-'); + if (index >= 0) { + bufferContent = bufferContent.substring(0, index); + } + myDescription.setLanguage("cz".equals(bufferContent) ? "cs" : bufferContent); + } + break; } } myBuffer.delete(0, myBuffer.length()); diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java index 30bd5f3fa..fb4db1feb 100644 --- a/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java +++ b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/pdb/DocDecompressor.java b/src/org/geometerplus/fbreader/formats/pdb/DocDecompressor.java index 8b15f1040..416bea0ca 100644 --- a/src/org/geometerplus/fbreader/formats/pdb/DocDecompressor.java +++ b/src/org/geometerplus/fbreader/formats/pdb/DocDecompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/pdb/PdbHeader.java b/src/org/geometerplus/fbreader/formats/pdb/PdbHeader.java index 2bac3be1e..62e8b9fec 100644 --- a/src/org/geometerplus/fbreader/formats/pdb/PdbHeader.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/pdb/PdbInputStream.java b/src/org/geometerplus/fbreader/formats/pdb/PdbInputStream.java index 61df20248..5b161efe5 100644 --- a/src/org/geometerplus/fbreader/formats/pdb/PdbInputStream.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbInputStream.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.fbreader.formats.pdb; import java.io.IOException; diff --git a/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java b/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java index d1d507631..6f9fcb53c 100644 --- a/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/pdb/PdbStream.java b/src/org/geometerplus/fbreader/formats/pdb/PdbStream.java index e735f3434..e4920e3ce 100644 --- a/src/org/geometerplus/fbreader/formats/pdb/PdbStream.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/pdb/PdbUtil.java b/src/org/geometerplus/fbreader/formats/pdb/PdbUtil.java index 278ca1bb5..499c291fe 100644 --- a/src/org/geometerplus/fbreader/formats/pdb/PdbUtil.java +++ b/src/org/geometerplus/fbreader/formats/pdb/PdbUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java b/src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java index 5f5ed1608..87588dd46 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java +++ b/src/org/geometerplus/fbreader/formats/plucker/DocCompressedFileImage.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.fbreader.formats.plucker; import java.io.IOException; diff --git a/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java index 33926383c..81e12867c 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerBookReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/plucker/PluckerFileImage.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerFileImage.java index e03c1524c..c997c5ddc 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/PluckerFileImage.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerFileImage.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.fbreader.formats.plucker; import java.io.IOException; diff --git a/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java index 63f10eaf3..eb6533cf4 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/plucker/PluckerTextStream.java b/src/org/geometerplus/fbreader/formats/plucker/PluckerTextStream.java index e797c352c..15afa4dc2 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/PluckerTextStream.java +++ b/src/org/geometerplus/fbreader/formats/plucker/PluckerTextStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java b/src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java index 95d0aea5d..d34c50559 100644 --- a/src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java +++ b/src/org/geometerplus/fbreader/formats/plucker/ZCompressedFileImage.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.fbreader.formats.plucker; import java.io.IOException; diff --git a/src/org/geometerplus/fbreader/formats/util/EncodingDetector.java b/src/org/geometerplus/fbreader/formats/util/EncodingDetector.java index 4e5e0f21b..c2350a8e8 100644 --- a/src/org/geometerplus/fbreader/formats/util/EncodingDetector.java +++ b/src/org/geometerplus/fbreader/formats/util/EncodingDetector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java index d93022139..d3ab260da 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagAction.java index f3febd5e3..56fa59fd2 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagControlAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagControlAction.java index 7081eda77..e5445629e 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagControlAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagControlAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagHyperlinkAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagHyperlinkAction.java index 0886e7b83..cd0a3e744 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagHyperlinkAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagHyperlinkAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java index e3bb46df7..45400813f 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagImageAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagItemAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagItemAction.java index 5cda15596..221583e91 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagItemAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagItemAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagParagraphAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagParagraphAction.java index bc8fe8aef..d70955874 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagParagraphAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagParagraphAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagParagraphWithControlAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagParagraphWithControlAction.java index 4c70e0af7..fe35165f7 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagParagraphWithControlAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagParagraphWithControlAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagPreAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagPreAction.java index 03c00e362..d8c2cef8e 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagPreAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagPreAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagRestartParagraphAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagRestartParagraphAction.java index 72dbe6fb9..9657ef1b6 100644 --- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagRestartParagraphAction.java +++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagRestartParagraphAction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/option/FBOptions.java b/src/org/geometerplus/fbreader/option/FBOptions.java index ef65702c9..7059db33b 100644 --- a/src/org/geometerplus/fbreader/option/FBOptions.java +++ b/src/org/geometerplus/fbreader/option/FBOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java b/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java index 9a6a16d60..e05373442 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java +++ b/src/org/geometerplus/fbreader/optionsDialog/ComboOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/optionsDialog/FormatOptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/FormatOptionsPage.java index a6217bb44..7c6885d0c 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/FormatOptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/FormatOptionsPage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/optionsDialog/KeyBindingsPage.java b/src/org/geometerplus/fbreader/optionsDialog/KeyBindingsPage.java index 8ebb17738..0e418952a 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/KeyBindingsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/KeyBindingsPage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java index 9c88f1676..080ae81bc 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java +++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java index 6b17dca87..d170f63b9 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/OptionsPage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/optionsDialog/ScrollingOptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/ScrollingOptionsPage.java index 3bcd6038b..c440c134d 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/ScrollingOptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/ScrollingOptionsPage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java b/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java index cb5b4236e..b36219c9d 100644 --- a/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java +++ b/src/org/geometerplus/fbreader/optionsDialog/StyleOptionsPage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/application/ZLApplication.java b/src/org/geometerplus/zlibrary/core/application/ZLApplication.java index 5fe7b78fb..94632959d 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLApplication.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLApplication.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java b/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java index aebf13cf6..33e427398 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLApplicationWindow.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java index 63e202c0f..13957796b 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java index 79e149652..db8b09b9c 100644 --- a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java +++ b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindingsReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/config/ZLConfig.java b/src/org/geometerplus/zlibrary/core/config/ZLConfig.java index c0190d94e..1bbefa76f 100644 --- a/src/org/geometerplus/zlibrary/core/config/ZLConfig.java +++ b/src/org/geometerplus/zlibrary/core/config/ZLConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java index 006f2d9dd..dd4be7c47 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLBoolean3OptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLBooleanOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLBooleanOptionEntry.java index 282642fa3..61acd0667 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLBooleanOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLBooleanOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLChoiceOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLChoiceOptionEntry.java index 34b260a25..f05c0500e 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLChoiceOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLChoiceOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLColorOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLColorOptionEntry.java index 4990bc20c..7b2fc5221 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLColorOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLColorOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java index f0958a3e6..9dd0979c6 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLComboOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialog.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialog.java index 5f3e09016..791d8a5b4 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialog.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java index 1492ba9a4..611ce77f4 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogContent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java index ac1c0b004..d42396760 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java index 0186c9fd5..e14d84dca 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLKeyOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLMultilineOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLMultilineOptionEntry.java index 18d3b3b4b..86ad957b6 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLMultilineOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLMultilineOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionEntry.java index e4d68f657..2f187cd6b 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionKind.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionKind.java index ee1a3a134..dd76b2fb0 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionKind.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionKind.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionView.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionView.java index cc182fa09..91dc645c3 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionView.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java index 80e774e9b..18d6d0d36 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOptionsDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java index 0fdf78de9..1068dfa3c 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLOrderOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLSpinOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLSpinOptionEntry.java index f75f8c1cb..04e642957 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLSpinOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLSpinOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLStringOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLStringOptionEntry.java index 5b485a6f9..9fd19f97a 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLStringOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLStringOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/dialogs/ZLTextOptionEntry.java b/src/org/geometerplus/zlibrary/core/dialogs/ZLTextOptionEntry.java index 6c7bfd109..87bfd406a 100644 --- a/src/org/geometerplus/zlibrary/core/dialogs/ZLTextOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/dialogs/ZLTextOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLDir.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLDir.java index 8cbd166c0..676939144 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLDir.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLDir.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLFSDir.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLFSDir.java index c6119c621..15bb58fde 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLFSDir.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLFSDir.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLFSUtil.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLFSUtil.java index 205d9ae11..390c02e86 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLFSUtil.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLFSUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java index f90fd9947..a27050710 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLFile.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -196,6 +196,8 @@ public class ZLFile { return path; } + //private static HashMap ourZipFileMap = new HashMap(); + public InputStream getInputStream() throws IOException { if (isDirectory()) { return null; @@ -210,7 +212,12 @@ public class ZLFile { InputStream base = baseFile.getInputStream(); if (base != null) { if (0 != (baseFile.myArchiveType & ArchiveType.ZIP)) { - ZipFile zf = new ZipFile(myPath.substring(0, index)); + final String baseFileName = myPath.substring(0, index); + ZipFile zf = null;//ourZipFileMap.get(baseFileName); + if (zf == null) { + zf = new ZipFile(baseFileName); + //ourZipFileMap.put(baseFileName, zf); + } /* ZipEntry entry = zf.getEntry(myPath.substring(index+1)); stream = zf.getInputStream(entry); diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLFileInfo.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLFileInfo.java index 7ab51447f..ffcef9a5a 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLFileInfo.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLFileInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLTarDir.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarDir.java index b90cf5435..bb88a97f2 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLTarDir.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarDir.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLTarHeader.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarHeader.java index af2049391..84afea853 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLTarHeader.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarHeader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLTarInputStream.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarInputStream.java index fd45919f1..2be717811 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLTarInputStream.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLTarInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/filesystem/ZLZipDir.java b/src/org/geometerplus/zlibrary/core/filesystem/ZLZipDir.java index a88adeec6..49b1dfc90 100644 --- a/src/org/geometerplus/zlibrary/core/filesystem/ZLZipDir.java +++ b/src/org/geometerplus/zlibrary/core/filesystem/ZLZipDir.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessor.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessor.java index c0f46d4f6..50cc2585f 100644 --- a/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessor.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessorFactory.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessorFactory.java index 7f2b9e309..c562f57f9 100644 --- a/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessorFactory.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlProcessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/html/ZLHtmlReader.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlReader.java index be4272561..db756b228 100644 --- a/src/org/geometerplus/zlibrary/core/html/ZLHtmlReader.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/html/ZLHtmlReaderAdapter.java b/src/org/geometerplus/zlibrary/core/html/ZLHtmlReaderAdapter.java index 4ae7f89ce..78b239b00 100644 --- a/src/org/geometerplus/zlibrary/core/html/ZLHtmlReaderAdapter.java +++ b/src/org/geometerplus/zlibrary/core/html/ZLHtmlReaderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/html/own/ZLMutableString.java b/src/org/geometerplus/zlibrary/core/html/own/ZLMutableString.java index 2b0834d02..3db13561f 100644 --- a/src/org/geometerplus/zlibrary/core/html/own/ZLMutableString.java +++ b/src/org/geometerplus/zlibrary/core/html/own/ZLMutableString.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlParser.java b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlParser.java index b31917a8f..28b0d72e0 100644 --- a/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlParser.java +++ b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessor.java b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessor.java index 0f0647c11..00361a847 100644 --- a/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessor.java +++ b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java index b8cf745a5..c03fd15b7 100644 --- a/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java +++ b/src/org/geometerplus/zlibrary/core/html/own/ZLOwnHtmlProcessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/image/ZLFileImage.java b/src/org/geometerplus/zlibrary/core/image/ZLFileImage.java index 500ba0a42..5d2fd6bb1 100644 --- a/src/org/geometerplus/zlibrary/core/image/ZLFileImage.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLFileImage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImage.java b/src/org/geometerplus/zlibrary/core/image/ZLImage.java index 5634e5d75..19a1af792 100644 --- a/src/org/geometerplus/zlibrary/core/image/ZLImage.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLImage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageData.java b/src/org/geometerplus/zlibrary/core/image/ZLImageData.java index a9ea7a81a..ff1f67002 100644 --- a/src/org/geometerplus/zlibrary/core/image/ZLImageData.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLImageData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageManager.java b/src/org/geometerplus/zlibrary/core/image/ZLImageManager.java index 6cbf10a6c..1dcd63cdf 100644 --- a/src/org/geometerplus/zlibrary/core/image/ZLImageManager.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLImageManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java b/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java index c5acb2c4b..d75fee61f 100644 --- a/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLImageMap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/image/ZLSingleImage.java b/src/org/geometerplus/zlibrary/core/image/ZLSingleImage.java index 74aa01d7b..ac497928d 100644 --- a/src/org/geometerplus/zlibrary/core/image/ZLSingleImage.java +++ b/src/org/geometerplus/zlibrary/core/image/ZLSingleImage.java @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2007-2009 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + package org.geometerplus.zlibrary.core.image; public abstract class ZLSingleImage implements ZLImage { diff --git a/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java index a66dcc20a..c95fbeae8 100644 --- a/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageDetector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java index 499556dd4..571b42e77 100644 --- a/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageList.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java b/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java index 47c5a70fe..bbc8d220a 100644 --- a/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java +++ b/src/org/geometerplus/zlibrary/core/language/ZLLanguageMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/library/ZLibrary.java b/src/org/geometerplus/zlibrary/core/library/ZLibrary.java index 88cb788b8..5a82b4bbf 100644 --- a/src/org/geometerplus/zlibrary/core/library/ZLibrary.java +++ b/src/org/geometerplus/zlibrary/core/library/ZLibrary.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,6 +64,7 @@ public abstract class ZLibrary { abstract protected InputStream getResourceInputStream(String fileName); abstract protected InputStream getFileInputStream(String fileName); + //abstract public String getVersionName(); abstract public ZLPaintContext getPaintContext(); abstract public void openInBrowser(String reference); } diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java index c41689322..58fb2f1e7 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLColorOptionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java index 1bb915902..c683eb942 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLFontFamilyOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java index dbea8002d..81991279e 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLLanguageOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java index 3eaccf89c..1a5c9e29c 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBoolean3OptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java index 3d8da17f7..bc5f3fb0d 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleBooleanOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java index 38a6928f2..ddb55fb7c 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleKeyOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java index 296a8b80d..7cb613601 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleSpinOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java index 9e9749a59..e2a4cdd11 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLSimpleStringOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLStringInfoEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLStringInfoEntry.java index b69ef9a51..810390d18 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLStringInfoEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLStringInfoEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java b/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java index 201da2b05..758ad654e 100644 --- a/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java +++ b/src/org/geometerplus/zlibrary/core/optionEntries/ZLToggleBooleanOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java b/src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java index 29af703ab..67797f6cf 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLBoolean3Option.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java b/src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java index 9e88321e0..66e094370 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLBooleanOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java b/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java index 9ec42476a..0ad15d53d 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLColorOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java b/src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java index 0b3891143..e848261fd 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLIntegerOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java b/src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java index 845a86753..6d5ee0f37 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLIntegerRangeOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/options/ZLOption.java b/src/org/geometerplus/zlibrary/core/options/ZLOption.java index 55cb53c5e..14d7f77de 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/options/ZLSimpleOption.java b/src/org/geometerplus/zlibrary/core/options/ZLSimpleOption.java index 07427e699..860b3f58d 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLSimpleOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLSimpleOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/options/ZLStringOption.java b/src/org/geometerplus/zlibrary/core/options/ZLStringOption.java index 2322ebef2..0d426adde 100644 --- a/src/org/geometerplus/zlibrary/core/options/ZLStringOption.java +++ b/src/org/geometerplus/zlibrary/core/options/ZLStringOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java b/src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java index 7bfe47acc..19bef80f1 100644 --- a/src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java +++ b/src/org/geometerplus/zlibrary/core/resources/ZLMissingResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/resources/ZLResource.java b/src/org/geometerplus/zlibrary/core/resources/ZLResource.java index bd291181c..0e880f6ca 100644 --- a/src/org/geometerplus/zlibrary/core/resources/ZLResource.java +++ b/src/org/geometerplus/zlibrary/core/resources/ZLResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java b/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java index eb97a7f54..53434232b 100644 --- a/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java +++ b/src/org/geometerplus/zlibrary/core/resources/ZLTreeResource.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/util/CharacterUtil.java b/src/org/geometerplus/zlibrary/core/util/CharacterUtil.java index a2ebb99c7..ea9a35b06 100644 --- a/src/org/geometerplus/zlibrary/core/util/CharacterUtil.java +++ b/src/org/geometerplus/zlibrary/core/util/CharacterUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java b/src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java index 5757e0c2b..f6fb9ca80 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLArrayUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java b/src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java index 0f5543087..5923aa578 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLBoolean3.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/util/ZLColor.java b/src/org/geometerplus/zlibrary/core/util/ZLColor.java index 82ef05475..77e939dc2 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLColor.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLColor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java b/src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java index 264c9a129..c288b18d7 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLSearchPattern.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java b/src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java index 446ce4c72..9881ba2a8 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLSearchUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/util/ZLTextBuffer.java b/src/org/geometerplus/zlibrary/core/util/ZLTextBuffer.java index e2345f092..b54fe7b7b 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLTextBuffer.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLTextBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/util/ZLUnicodeUtil.java b/src/org/geometerplus/zlibrary/core/util/ZLUnicodeUtil.java index 78396fa3d..e1bbc0b75 100644 --- a/src/org/geometerplus/zlibrary/core/util/ZLUnicodeUtil.java +++ b/src/org/geometerplus/zlibrary/core/util/ZLUnicodeUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java index 910521ce9..a7c92d298 100644 --- a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java +++ b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/view/ZLView.java b/src/org/geometerplus/zlibrary/core/view/ZLView.java index 7ea4bd754..4cceed9b6 100644 --- a/src/org/geometerplus/zlibrary/core/view/ZLView.java +++ b/src/org/geometerplus/zlibrary/core/view/ZLView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java b/src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java index ebf22cf5d..bde5b8efa 100644 --- a/src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java +++ b/src/org/geometerplus/zlibrary/core/view/ZLViewWidget.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java b/src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java index b63babde1..de239956a 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLStringMap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java index c25391545..71385b9e9 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,8 @@ import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.library.ZLibrary; public abstract class ZLXMLProcessor { + public abstract void setBufferSize(int bufferSize); + public abstract boolean read(ZLXMLReader xmlReader, InputStream stream); public boolean read(ZLXMLReader xmlReader, String fileName) { diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessorFactory.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessorFactory.java index 37e0f4198..7fc9f1625 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessorFactory.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLProcessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java index c1c6c871d..bf0ddec6a 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java index 6851dd689..32a467fed 100644 --- a/src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java +++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/xml/own/ZLMutableString.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLMutableString.java index 6483c06fc..6e96233df 100644 --- a/src/org/geometerplus/zlibrary/core/xml/own/ZLMutableString.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLMutableString.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnDTDParser.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnDTDParser.java index cb1271f87..7e6513c55 100644 --- a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnDTDParser.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnDTDParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLParser.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLParser.java index 1bfcc4e25..932c6ea64 100644 --- a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLParser.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ import java.io.*; import java.util.*; import org.geometerplus.zlibrary.core.util.*; import org.geometerplus.zlibrary.core.filesystem.*; +import org.geometerplus.zlibrary.core.library.ZLibrary; import org.geometerplus.zlibrary.core.util.ZLArrayUtils; import org.geometerplus.zlibrary.core.xml.ZLStringMap; @@ -61,14 +62,15 @@ final class ZLOwnXMLParser { private final ZLXMLReader myXMLReader; private final boolean myProcessNamespaces; - private final char[] myBuffer = new char[65536]; + private final char[] myBuffer; - public ZLOwnXMLParser(ZLXMLReader xmlReader, InputStream stream) throws IOException { + public ZLOwnXMLParser(ZLXMLReader xmlReader, InputStream stream, int bufferSize) throws IOException { myXMLReader = xmlReader; myProcessNamespaces = xmlReader.processNamespaces(); String encoding = "utf-8"; - final char[] buffer = myBuffer; + final char[] buffer = new char[bufferSize]; + myBuffer = buffer; int len; for (len = 0; len < 256; ++len) { char c = (char)stream.read(); @@ -125,6 +127,7 @@ final class ZLOwnXMLParser { entityMap.put("gt", new char[] { '>' }); entityMap.put("lt", new char[] { '<' }); entityMap.put("quot", new char[] { '\"' }); + //entityMap.put("FBReaderVersion", ZLibrary.Instance().getVersionName().toCharArray()); final int dtdListSize = dtdList.size(); for (int i = 0; i < dtdListSize; ++i) { InputStream stream = new ZLFile((String)dtdList.get(i)).getInputStream(); diff --git a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessor.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessor.java index 866fd73bd..c98e974d1 100644 --- a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessor.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,9 +26,15 @@ import org.geometerplus.zlibrary.core.xml.ZLXMLProcessor; import org.geometerplus.zlibrary.core.xml.ZLXMLReader; public class ZLOwnXMLProcessor extends ZLXMLProcessor { + private int myBufferSize = 65536; + + public void setBufferSize(int bufferSize) { + myBufferSize = bufferSize; + } + public boolean read(ZLXMLReader reader, InputStream stream) { try { - ZLOwnXMLParser parser = new ZLOwnXMLParser(reader, stream); + ZLOwnXMLParser parser = new ZLOwnXMLParser(reader, stream, myBufferSize); reader.startDocumentHandler(); parser.doIt(); reader.endDocumentHandler(); diff --git a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java index 7af0f0f55..a53b15d96 100644 --- a/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java +++ b/src/org/geometerplus/zlibrary/core/xml/own/ZLOwnXMLProcessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java index cfa46898d..6fc88005b 100644 --- a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java index 46778ee73..b40697375 100644 --- a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenationReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java index be0f39c23..a8713d22f 100644 --- a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java index 682ef28d1..1466396ef 100644 --- a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenationPattern.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java index 44949c6e7..e9b1c89d9 100644 --- a/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java +++ b/src/org/geometerplus/zlibrary/text/hyphenation/ZLTextTeXHyphenator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java b/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java index b851be365..788b02dfc 100644 --- a/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java +++ b/src/org/geometerplus/zlibrary/text/model/CachedCharStorage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,11 +33,18 @@ final class CachedCharStorageException extends RuntimeException { final class CachedCharStorage implements CharStorage { private final int myBlockSize; private final ArrayList > myArray = new ArrayList >(1024); - private final String myFileNamePrefix; + private final String myDirectoryName; + private final String myFileExtension; - CachedCharStorage(int blockSize, String fileNamePrefix) { + private String fileName(int index) { + return myDirectoryName + index + myFileExtension; + } + + CachedCharStorage(int blockSize, String directoryName, String fileExtension) { myBlockSize = blockSize; - myFileNamePrefix = fileNamePrefix; + myDirectoryName = directoryName + '/'; + myFileExtension = '.' + fileExtension; + new File(directoryName).mkdirs(); } public int size() { @@ -48,10 +55,10 @@ final class CachedCharStorage implements CharStorage { char[] block = myArray.get(index).get(); if (block == null) { try { - File file = new File(myFileNamePrefix + index); + File file = new File(fileName(index)); int size = (int)file.length(); if (size < 0) { - throw new CachedCharStorageException("Error during reading " + myFileNamePrefix + index); + throw new CachedCharStorageException("Error during reading " + fileName(index)); } block = new char[size / 2]; InputStreamReader reader = @@ -60,13 +67,13 @@ final class CachedCharStorage implements CharStorage { "UTF-16LE" ); if (reader.read(block) != block.length) { - throw new CachedCharStorageException("Error during reading " + myFileNamePrefix + index); + throw new CachedCharStorageException("Error during reading " + fileName(index)); } reader.close(); } catch (FileNotFoundException e) { - throw new CachedCharStorageException("Error during reading " + myFileNamePrefix + index); + throw new CachedCharStorageException("Error during reading " + fileName(index)); } catch (IOException e) { - throw new CachedCharStorageException("Error during reading " + myFileNamePrefix + index); + throw new CachedCharStorageException("Error during reading " + fileName(index)); } myArray.set(index, new WeakReference(block)); } @@ -93,13 +100,13 @@ final class CachedCharStorage implements CharStorage { try { OutputStreamWriter writer = new OutputStreamWriter( - new FileOutputStream(myFileNamePrefix + index), + new FileOutputStream(fileName(index)), "UTF-16LE" ); writer.write(block); writer.close(); } catch (IOException e) { - throw new CachedCharStorageException("Error during writing " + myFileNamePrefix + index); + throw new CachedCharStorageException("Error during writing " + fileName(index)); } } } diff --git a/src/org/geometerplus/zlibrary/text/model/CharStorage.java b/src/org/geometerplus/zlibrary/text/model/CharStorage.java index 139543040..4e744cf9b 100644 --- a/src/org/geometerplus/zlibrary/text/model/CharStorage.java +++ b/src/org/geometerplus/zlibrary/text/model/CharStorage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java b/src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java index c8a452c3b..65475e295 100644 --- a/src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java +++ b/src/org/geometerplus/zlibrary/text/model/SimpleCharStorage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLImageEntry.java b/src/org/geometerplus/zlibrary/text/model/ZLImageEntry.java index 13ac8d0d6..9a0e8090c 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLImageEntry.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLImageEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java b/src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java index a8d5b3807..c45aa0f47 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextAlignmentType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextForcedControlEntry.java b/src/org/geometerplus/zlibrary/text/model/ZLTextForcedControlEntry.java index c01f9c94f..6a2562eb1 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextForcedControlEntry.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextForcedControlEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextMark.java b/src/org/geometerplus/zlibrary/text/model/ZLTextMark.java index 959e5ea8c..7537e207b 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextMark.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextMark.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextModel.java b/src/org/geometerplus/zlibrary/text/model/ZLTextModel.java index 8dc4cbae7..d6fbfac57 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextModel.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextModelImpl.java b/src/org/geometerplus/zlibrary/text/model/ZLTextModelImpl.java index 86fd62b15..0f3e06efc 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextModelImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextModelImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java b/src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java index 948254615..1b56386ab 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextParagraph.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextParagraphImpl.java b/src/org/geometerplus/zlibrary/text/model/ZLTextParagraphImpl.java index aa066553e..1d818e881 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextParagraphImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextParagraphImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java b/src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java index 77a0006f2..e1bf25f81 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,8 +24,12 @@ import org.geometerplus.zlibrary.core.util.ZLArrayUtils; public final class ZLTextPlainModel extends ZLTextModelImpl { private byte[] myParagraphKinds = new byte[INITIAL_CAPACITY]; + public ZLTextPlainModel(int dataBlockSize, String directoryName, String extension) { + super(new CachedCharStorage(dataBlockSize, directoryName, extension)); + } + public ZLTextPlainModel(int dataBlockSize) { - super(new CachedCharStorage(dataBlockSize, "/sdcard/Books/.FBReaderCache")); + super(new SimpleCharStorage(dataBlockSize)); } public int getParagraphsNumber() { diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextSpecialParagraphImpl.java b/src/org/geometerplus/zlibrary/text/model/ZLTextSpecialParagraphImpl.java index e11598982..fe4a932f5 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextSpecialParagraphImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextSpecialParagraphImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextTreeModel.java b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeModel.java index 54818a9c5..95054af05 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextTreeModel.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraph.java b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraph.java index 767ba7902..c72bf50e6 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraph.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraph.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraphImpl.java b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraphImpl.java index 9da903e16..80d056b50 100644 --- a/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraphImpl.java +++ b/src/org/geometerplus/zlibrary/text/model/ZLTextTreeParagraphImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java index 0a15a5dd8..5af544fdb 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextAlignmentOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java index d7cac5b04..c8851ca00 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextFontFamilyWithBaseOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java b/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java index f5e7a61d7..1efae851f 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextLineSpaceOptionEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java b/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java index d6e447d09..3f139d3c3 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java index 4aa9cc2fe..c922de948 100644 --- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java +++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextControlElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextControlElement.java index 92270be04..47e3ff6cb 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextControlElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextControlElement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElement.java index 2178aa505..06226e5e1 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElementArea.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElementArea.java index c4ffaa4ad..0719cd318 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElementArea.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextElementArea.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java index 3f39225e3..85bb21eb7 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextFixedHSpaceElement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java index ba757f2f2..237067dd5 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextHyperlinkControlElement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextImageElement.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextImageElement.java index 1ab229033..4a7e5c4df 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextImageElement.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextImageElement.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfo.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfo.java index 7ab0f74eb..00dda0756 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfo.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoCache.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoCache.java index 9740e5ac4..70d3ea611 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoCache.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoCache.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoVector.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoVector.java index 9ab36cde9..6286255e9 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoVector.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextLineInfoVector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursor.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursor.java index 816beacbc..8e3700e7c 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java index d008fc12b..35536916a 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextParagraphCursorCache.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java index 66682bded..eb179efc3 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextPlainParagraphCursor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularArea.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularArea.java index aa87cf3d8..0f3d0ae95 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularArea.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularArea.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java index 64db5f14c..411e6fe9a 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextRectangularAreaVector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextSelectionModel.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextSelectionModel.java index 0e254e4bc..63e49ea32 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextSelectionModel.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextSelectionModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeNodeArea.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeNodeArea.java index b57f38d12..50ef93cd8 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeNodeArea.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeNodeArea.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java index 31ec51e0b..8e2bfca6c 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextTreeParagraphCursor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextViewImpl.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextViewImpl.java index c1257b016..ded183bc8 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextViewImpl.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextViewImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWord.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWord.java index cd74b7806..78cffdaaa 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWord.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWord.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWordCursor.java b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWordCursor.java index 6df818a92..76e7cf3d8 100644 --- a/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWordCursor.java +++ b/src/org/geometerplus/zlibrary/text/view/impl/ZLTextWordCursor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/style/HyperlinkStyle.java b/src/org/geometerplus/zlibrary/text/view/style/HyperlinkStyle.java index d1cdc0873..f4e3c5390 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/HyperlinkStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/HyperlinkStyle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java index e8a77af08..d9968496c 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java index f19ca9a32..02647f4f9 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java index ceb162f06..54582f6f7 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java index eca1d1858..3722b0a61 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java index c44abb271..3f9b41edc 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java index 5fbd00672..6a7e4f2c2 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java index 0beb9617c..4eb479710 100644 --- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java +++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Geometer Plus + * Copyright (C) 2007-2009 Geometer Plus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by