From 2032f9628ba6178c832d99a3ddc04edfaff19ff6 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Thu, 23 Feb 2012 15:57:46 +0100
Subject: [PATCH] synchronization with native branch

---
 .../fbreader/filetype/FileTypeCollection.java          | 10 ++++++++++
 .../geometerplus/fbreader/formats/FormatPlugin.java    |  6 ------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/org/geometerplus/fbreader/filetype/FileTypeCollection.java b/src/org/geometerplus/fbreader/filetype/FileTypeCollection.java
index f47414b5a..58cc5d0e5 100644
--- a/src/org/geometerplus/fbreader/filetype/FileTypeCollection.java
+++ b/src/org/geometerplus/fbreader/filetype/FileTypeCollection.java
@@ -21,6 +21,7 @@ package org.geometerplus.fbreader.filetype;
 
 import java.util.*;
 
+import org.geometerplus.zlibrary.core.filesystem.ZLFile;
 import org.geometerplus.zlibrary.core.util.MimeType;
 
 public class FileTypeCollection {
@@ -49,4 +50,13 @@ public class FileTypeCollection {
 	public FileType typeById(String id) {
 		return myTypes.get(id.toLowerCase());
 	}
+
+	public FileType typeForFile(ZLFile file) {
+		for (FileType type : types()) {
+			if (type.acceptsFile(file)) {
+				return type;
+			}
+		}
+		return null;
+	}
 }
diff --git a/src/org/geometerplus/fbreader/formats/FormatPlugin.java b/src/org/geometerplus/fbreader/formats/FormatPlugin.java
index 199a88de0..43d2283c3 100644
--- a/src/org/geometerplus/fbreader/formats/FormatPlugin.java
+++ b/src/org/geometerplus/fbreader/formats/FormatPlugin.java
@@ -24,14 +24,8 @@ import org.geometerplus.zlibrary.core.image.ZLImage;
 
 import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.library.Book;
-import org.geometerplus.fbreader.filetype.*;
 
 public abstract class FormatPlugin {
-	public final boolean acceptsFile(ZLFile file) {
-		final FileType fileType = FileTypeCollection.Instance.typeById(supportedFileType());
-		return fileType != null && fileType.acceptsFile(file);
-	}
-
 	public abstract String supportedFileType();
 	public abstract boolean readMetaInfo(Book book);
 	public abstract boolean readLanguageAndEncoding(Book book);