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

BookReadingException moved to formats package

Browse source
This commit is contained in:
Nikolay Pultsin 2015-06-11 20:50:25 +01:00
parent 943b01dc5d
commit d1b9e2e769
14 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.BookReadingException;
import org.geometerplus.fbreader.formats.FormatPlugin;
import org.geometerplus.android.fbreader.api.FBReaderIntents;

1
src/org/geometerplus/fbreader/book/BookCollection.java
View file

@ -29,7 +29,6 @@ import org.geometerplus.zlibrary.core.util.MiscUtil;
import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;
import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.*;
public class BookCollection extends AbstractBookCollection<DbBook> {

2
src/org/geometerplus/fbreader/book/BookMergeHelper.java
View file

@ -25,7 +25,7 @@ import org.geometerplus.zlibrary.core.util.MiscUtil;
import org.geometerplus.zlibrary.core.util.RationalNumber;
import org.geometerplus.zlibrary.text.view.ZLTextPosition;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.BookReadingException;
class BookMergeHelper {
private final IBookCollection myCollection;

4
src/org/geometerplus/fbreader/book/BookUtil.java
View file

@ -29,9 +29,7 @@ import java.util.*;
import org.geometerplus.zlibrary.core.filesystem.*;
import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.FormatPlugin;
import org.geometerplus.fbreader.formats.PluginCollection;
import org.geometerplus.fbreader.formats.*;
public abstract class BookUtil {
private static final WeakReference<ZLImage> NULL_IMAGE = new WeakReference<ZLImage>(null);

2
src/org/geometerplus/fbreader/book/DbBook.java
View file

@ -24,7 +24,7 @@ import java.util.*;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.util.MiscUtil;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.BookReadingException;
import org.geometerplus.fbreader.formats.FormatPlugin;
public final class DbBook extends AbstractBook {

3
src/org/geometerplus/fbreader/bookmodel/BookModel.java
View file

@ -27,8 +27,7 @@ import org.geometerplus.zlibrary.text.model.*;
import org.geometerplus.fbreader.book.Book;
import org.geometerplus.fbreader.book.BookUtil;
import org.geometerplus.fbreader.formats.BuiltinFormatPlugin;
import org.geometerplus.fbreader.formats.FormatPlugin;
import org.geometerplus.fbreader.formats.*;
public final class BookModel {
public static BookModel createModel(Book book) throws BookReadingException {

3
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
View file

@ -33,8 +33,7 @@ import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.bookmodel.*;
import org.geometerplus.fbreader.fbreader.options.*;
import org.geometerplus.fbreader.formats.ExternalFormatPlugin;
import org.geometerplus.fbreader.formats.FormatPlugin;
import org.geometerplus.fbreader.formats.*;
import org.geometerplus.fbreader.network.sync.SyncData;
import org.geometerplus.fbreader.util.AutoTextSnippet;
import org.geometerplus.fbreader.util.EmptyTextSnippet;

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

@ -17,7 +17,7 @@
* 02110-1301, USA.
*/
package org.geometerplus.fbreader.bookmodel;
package org.geometerplus.fbreader.formats;
import java.io.IOException;

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

@ -20,7 +20,6 @@
package org.geometerplus.fbreader.formats;
import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
public abstract class BuiltinFormatPlugin extends FormatPlugin {
protected BuiltinFormatPlugin(String fileType) {

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

@ -29,7 +29,6 @@ import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.fbreader.book.AbstractBook;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
public abstract class FormatPlugin {
private final String myFileType;

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

@ -31,7 +31,6 @@ import org.geometerplus.zlibrary.text.model.CachedCharStorageException;
import org.geometerplus.fbreader.book.AbstractBook;
import org.geometerplus.fbreader.book.BookUtil;
import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.fb2.FB2NativePlugin;
import org.geometerplus.fbreader.formats.oeb.OEBNativePlugin;

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

@ -25,7 +25,6 @@ import org.pdfparse.model.PDFDocument;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.fbreader.book.AbstractBook;
import org.geometerplus.fbreader.book.BookUtil;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
public class PDFPlugin extends ExternalFormatPlugin {
public PDFPlugin() {

2
src/org/geometerplus/fbreader/formats/fb2/FB2NativePlugin.java
View file

@ -30,7 +30,7 @@ import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.fbreader.book.AbstractBook;
import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.BookReadingException;
import org.geometerplus.fbreader.formats.NativeFormatPlugin;
public class FB2NativePlugin extends NativeFormatPlugin {

2
src/org/geometerplus/fbreader/formats/oeb/OEBNativePlugin.java
View file

@ -29,7 +29,7 @@ import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.fbreader.book.AbstractBook;
import org.geometerplus.fbreader.book.BookUtil;
import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.fbreader.bookmodel.BookReadingException;
import org.geometerplus.fbreader.formats.BookReadingException;
import org.geometerplus.fbreader.formats.NativeFormatPlugin;
public class OEBNativePlugin extends NativeFormatPlugin {