X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderSearch.java;h=e7a1f2b518a54c52fb6267bdb7731fe9eacb73b9;hp=59d4f21786724a90a5a0d39c5ea40abdb30f5593;hb=c499d79f13535082dd25c7ee46e897d3372c4299;hpb=81acd363d9b0af424d462e9d2e6a07b160e7af3b

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
index 59d4f21..e7a1f2b 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
@@ -1,6 +1,7 @@
 package be.nikiroo.fanfix.reader.ui;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
@@ -198,10 +199,12 @@ public class GuiReaderSearch extends JFrame {
 	}
 
 	private void updateBooks(final List<GuiReaderBookInfo> infos) {
+		setWaitingScreen(true);
 		inUi(new Runnable() {
 			@Override
 			public void run() {
 				books.refreshBooks(infos, seeWordcount);
+				setWaitingScreen(false);
 			}
 		});
 	}
@@ -252,57 +255,67 @@ public class GuiReaderSearch extends JFrame {
 		}).start();
 	}
 
-	public void searchTag(SupportType searchOn, int page, int item,
-			SearchableTag tag) {
+	public void searchTag(final SupportType searchOn, final int page,
+			final int item, final SearchableTag tag) {
+
+		setWaitingScreen(true);
 
 		updateSupportType(searchOn);
 		updateSearchBy(true);
 		updateTags(tag);
 		updatePages(page, maxPage);
 
-		BasicSearchable search = BasicSearchable.getSearchable(searchOn);
-
-		if (tag != null) {
-			int maxPage = 0;
-			try {
-				maxPage = search.searchPages(tag);
-			} catch (IOException e) {
-				Instance.getTraceHandler().error(e);
-			}
-
-			updatePages(page, maxPage);
-
-			if (page > 0) {
-				List<MetaData> metas = null;
-				List<SearchableTag> subtags = null;
-				int count;
+		new Thread(new Runnable() {
+			@Override
+			public void run() {
+				BasicSearchable search = BasicSearchable
+						.getSearchable(searchOn);
 
-				if (tag.isLeaf()) {
+				if (tag != null) {
+					int maxPage = 0;
 					try {
-						metas = search.search(tag, page);
+						maxPage = search.searchPages(tag);
 					} catch (IOException e) {
-						metas = new ArrayList<MetaData>();
 						Instance.getTraceHandler().error(e);
 					}
-					count = metas.size();
-				} else {
-					subtags = tag.getChildren();
-					count = subtags.size();
-				}
 
-				if (item > 0) {
-					if (item <= count) {
-						if (metas != null) {
-							MetaData meta = metas.get(item - 1);
-							// TODO: select story
+					updatePages(page, maxPage);
+
+					if (page > 0) {
+						List<MetaData> metas = null;
+						List<SearchableTag> subtags = null;
+						int count;
+
+						if (tag.isLeaf()) {
+							try {
+								metas = search.search(tag, page);
+							} catch (IOException e) {
+								metas = new ArrayList<MetaData>();
+								Instance.getTraceHandler().error(e);
+							}
+							count = metas.size();
 						} else {
-							SearchableTag subtag = subtags.get(item - 1);
-							// TODO: search on tag
+							subtags = tag.getChildren();
+							count = subtags.size();
+						}
+
+						if (item > 0) {
+							if (item <= count) {
+								if (metas != null) {
+									MetaData meta = metas.get(item - 1);
+									// TODO: select story
+								} else {
+									SearchableTag subtag = subtags
+											.get(item - 1);
+									// TODO: search on tag
+								}
+							}
 						}
 					}
 				}
+				setWaitingScreen(false);
 			}
-		}
+		}).start();
 	}
 
 	/**
@@ -316,7 +329,7 @@ public class GuiReaderSearch extends JFrame {
 	 * @param run
 	 *            the action to run
 	 */
-	public void inUi(final Runnable run) {
+	private void inUi(final Runnable run) {
 		if (EventQueue.isDispatchThread()) {
 			run.run();
 		} else {
@@ -329,4 +342,19 @@ public class GuiReaderSearch extends JFrame {
 			}
 		}
 	}
+
+	private void setWaitingScreen(final boolean waiting) {
+		inUi(new Runnable() {
+			@Override
+			public void run() {
+				GuiReaderSearch.this.setEnabled(!waiting);
+				// TODO: this is just an example of something to do
+				if (waiting) {
+					books.setBackground(Color.RED);
+				} else {
+					books.setBackground(null);
+				}
+			}
+		});
+	}
 }