From 002e86ca764a271d1a6e2e23dace39bbdcebb41e Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Thu, 25 Apr 2013 03:06:07 +0200 Subject: [PATCH] synchronization with beta branch --- .../zlibrary/core/filetypes/FileTypeEpub.java | 7 ------- .../zlibrary/core/filetypes/FileTypeMobipocket.java | 12 +++++------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeEpub.java b/src/org/geometerplus/zlibrary/core/filetypes/FileTypeEpub.java index e575f7bec..748e9a234 100644 --- a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeEpub.java +++ b/src/org/geometerplus/zlibrary/core/filetypes/FileTypeEpub.java @@ -38,13 +38,6 @@ class FileTypeEpub extends FileType { "opf".equalsIgnoreCase(extension); } - /* - @Override - public String extension() { - return "epub"; - } - */ - @Override public List mimeTypes() { return MimeType.TYPES_EPUB; diff --git a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeMobipocket.java b/src/org/geometerplus/zlibrary/core/filetypes/FileTypeMobipocket.java index f40ccbc5d..0e5fdc5d0 100644 --- a/src/org/geometerplus/zlibrary/core/filetypes/FileTypeMobipocket.java +++ b/src/org/geometerplus/zlibrary/core/filetypes/FileTypeMobipocket.java @@ -34,13 +34,6 @@ class FileTypeMobipocket extends FileTypePalm { return "mobi".equalsIgnoreCase(file.getExtension()) || super.acceptsFile(file); } - /* - @Override - public String extension() { - return "mobi"; - } - */ - @Override public List mimeTypes() { return MimeType.TYPES_MOBIPOCKET; @@ -50,4 +43,9 @@ class FileTypeMobipocket extends FileTypePalm { public MimeType mimeType(ZLFile file) { return acceptsFile(file) ? MimeType.APP_MOBIPOCKET : MimeType.NULL; } + + @Override + public String defaultExtension(MimeType mime) { + return "mobi"; + } }