X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=0205e11489ba783b85102781c93d7932207489eb;hb=d46b7b96f94e88a776bcd2dfd756549ffb300cc9;hp=0cace9cd992b2fe317642316255a7dfcbf174b36;hpb=bf2b37b0aca363d30d8086c440dd2cb23e6e0915;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 0cace9c..0205e11 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -223,7 +223,7 @@ class GuiReader extends BasicReader {
 
 	@Override
 	public void search(boolean sync) throws IOException {
-		GuiReaderSearch search = new GuiReaderSearch(this);
+		GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
 		if (sync) {
 			sync(search);
 		} else {
@@ -234,7 +234,7 @@ class GuiReader extends BasicReader {
 	@Override
 	public void search(SupportType searchOn, String keywords, int page,
 			int item, boolean sync) {
-		GuiReaderSearch search = new GuiReaderSearch(this);
+		GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
 		search.search(searchOn, keywords, page, item);
 		if (sync) {
 			sync(search);
@@ -247,7 +247,8 @@ class GuiReader extends BasicReader {
 	public void searchTag(final SupportType searchOn, final int page,
 			final int item, final boolean sync, final Integer... tags) {
 
-		final GuiReaderSearch search = new GuiReaderSearch(GuiReader.this);
+		final GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
+
 		final BasicSearchable searchable = BasicSearchable
 				.getSearchable(searchOn);
 
@@ -257,9 +258,6 @@ class GuiReader extends BasicReader {
 				SearchableTag tag = null;
 				try {
 					tag = searchable.getTag(tags);
-					if (tag != null) {
-						searchable.fillTag(tag);
-					}
 				} catch (IOException e) {
 					Instance.getTraceHandler().error(e);
 				}
@@ -319,8 +317,6 @@ class GuiReader extends BasicReader {
 	/**
 	 * "Open" the given {@link Story}. It usually involves starting an external
 	 * program adapted to the given file type.
-	 * <p>
-	 * Asynchronous method.
 	 * 
 	 * @param luid
 	 *            the luid of the {@link Story} to open
@@ -364,6 +360,24 @@ class GuiReader extends BasicReader {
 		}
 	}
 
+
+	/**
+	 * "Prefetch" the given {@link Story}.
+	 * <p>
+	 * Synchronous method.
+	 * 
+	 * @param luid
+	 *            the luid of the {@link Story} to prefetch
+	 * @param pg
+	 *            the optional progress (we may need to prepare the
+	 *            {@link Story} for reading
+	 * 
+	 * @throws IOException
+	 *             in case of I/O errors
+	 */
+	void prefetch(String luid, Progress pg) throws IOException {
+		cacheLib.getFile(luid, pg);
+	}
 	/**
 	 * Change the source of the given {@link Story} (the source is the main
 	 * information used to group the stories together).