code cleanup

[fanfix.git] / src / be / nikiroo / fanfix / reader / ui / GuiReaderSearch.java

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
index 0046e89e4ad375671de88cae65f9d6eb85dc0fb8..50d3d82f4b80f23b6291da3c61e0166969412626 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
@@ -36,18 +36,20 @@ import be.nikiroo.fanfix.supported.SupportType;
  * 
  * @author niki
  */
+// JCombobox<E> not 1.6 compatible
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class GuiReaderSearch extends JFrame {
        private static final long serialVersionUID = 1L;
 
        private List<SupportType> supportTypes;
        private SupportType supportType;
        private boolean searchByTags;
-       private List<SearchableTag> tags;
        private String keywords;
        private int page;
        private int maxPage;
 
        private JPanel tagBars;
+       private List<JComboBox> combos;
 
        private JComboBox comboSupportTypes;
        private JTabbedPane searchTabs;
@@ -62,7 +64,6 @@ public class GuiReaderSearch extends JFrame {
                setLayout(new BorderLayout());
                setSize(800, 600);
 
-               tags = new ArrayList<SearchableTag>();
                page = 1; // TODO
                maxPage = -1;
                searchByTags = false;
@@ -144,6 +145,8 @@ public class GuiReaderSearch extends JFrame {
        }
 
        private JPanel createByTagSearchPanel() {
+               combos = new ArrayList<JComboBox>();
+
                JPanel byTag = new JPanel();
                tagBars = new JPanel();
                tagBars.setLayout(new BoxLayout(tagBars, BoxLayout.Y_AXIS));
@@ -254,12 +257,12 @@ public class GuiReaderSearch extends JFrame {
                });
        }
 
-       // not 1.6 compatible
-       @SuppressWarnings({ "unchecked", "rawtypes" })
        private void addTagBar(List<SearchableTag> tags,
                        final SearchableTag selected) {
                tags.add(0, null);
 
+               final int comboIndex = combos.size();
+
                final JComboBox combo = new JComboBox(
                                tags.toArray(new SearchableTag[] {}));
                combo.setSelectedItem(selected);
@@ -298,10 +301,30 @@ public class GuiReaderSearch extends JFrame {
                                final SearchableTag tag = (SearchableTag) combo
                                                .getSelectedItem();
                                if (tag != null) {
+                                       while (comboIndex + 1 < combos.size()) {
+                                               JComboBox combo = combos.remove(comboIndex + 1);
+                                               tagBars.remove(combo);
+                                       }
+
                                        addTagBar(tag, new Runnable() {
                                                @Override
                                                public void run() {
-                                                       // TODO: stories if needed
+                                                       // TODO: slow ui
+                                                       SearchableTag tag = ((SearchableTag) combo
+                                                                       .getSelectedItem());
+                                                       if (tag != null && tag.isLeaf()) {
+                                                               BasicSearchable searchable = BasicSearchable
+                                                                               .getSearchable(supportType);
+                                                               List<MetaData> metas = new ArrayList<MetaData>();
+                                                               try {
+                                                                       metas = searchable.search(tag, 1);
+                                                                       search(metas, 1,
+                                                                                       searchable.searchPages(tag), 0);
+                                                               } catch (IOException e) {
+                                                                       error(e);
+                                                               }
+                                                       }
+
                                                        setWaitingScreen(false);
                                                }
                                        });
@@ -309,6 +332,7 @@ public class GuiReaderSearch extends JFrame {
                        }
                });
 
+               combos.add(combo);
                tagBars.add(combo);
        }
 
@@ -339,7 +363,6 @@ public class GuiReaderSearch extends JFrame {
                                                children = tag.getChildren();
                                        } else {
                                                children = null;
-                                               // TODO: stories
                                        }
                                }
 
@@ -409,7 +432,7 @@ public class GuiReaderSearch extends JFrame {
                }).start();
        }
 
-       // tag: must be filled (or NULL for base tags)
+       // tag: null = base tags
        public void searchTag(final SupportType searchOn, final int page,
                        final int item, final SearchableTag tag) {
 
@@ -427,6 +450,12 @@ public class GuiReaderSearch extends JFrame {
                                                .getSearchable(searchOn);
 
                                if (tag != null) {
+                                       try {
+                                               search.fillTag(tag);
+                                       } catch (IOException e) {
+                                               error(e);
+                                       }
+
                                        int maxPage = 0;
                                        try {
                                                maxPage = search.searchPages(tag);