git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUI search: reorg, step 2
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
ui
/
GuiReaderSearchByNamePanel.java
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByNamePanel.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByNamePanel.java
index 625dc93e2d4c9fd84d364994a9093f1f57b315c1..a627d3a9e0b65c70c1abccad31bbc5b28c341e82 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByNamePanel.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByNamePanel.java
@@
-54,10
+54,12
@@
public class GuiReaderSearchByNamePanel extends JPanel {
private List<MetaData> stories = new ArrayList<MetaData>();
private int storyItem;
private List<MetaData> stories = new ArrayList<MetaData>();
private int storyItem;
- // will throw illegalArgEx if bad support type
+ // will throw illegalArgEx if bad support type
, NULL allowed
public GuiReaderSearchByNamePanel(SupportType supportType) {
setLayout(new BorderLayout());
public GuiReaderSearchByNamePanel(SupportType supportType) {
setLayout(new BorderLayout());
+ // TODO: check if null really is OK for supportType (must be)
+
setSupportType(supportType);
page = 1;
searchByTags = false;
setSupportType(supportType);
page = 1;
searchByTags = false;
@@
-83,7
+85,7
@@
public class GuiReaderSearchByNamePanel extends JPanel {
submitKeywords.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
submitKeywords.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- search(keywordsField.getText(), 0);
+ search(keywordsField.getText(), 0
, null
);
}
});
}
});
@@
-107,11
+109,14
@@
public class GuiReaderSearchByNamePanel extends JPanel {
public void setSupportType(SupportType supportType) {
BasicSearchable searchable = BasicSearchable.getSearchable(supportType);
public void setSupportType(SupportType supportType) {
BasicSearchable searchable = BasicSearchable.getSearchable(supportType);
- if (searchable == null) {
+ if (searchable == null
&& supportType != null
) {
throw new java.lang.IllegalArgumentException(
"Unupported support type: " + supportType);
}
throw new java.lang.IllegalArgumentException(
"Unupported support type: " + supportType);
}
+ // TODO: if <>, reset all
+ // if new, set the base tags
+
this.supportType = supportType;
this.searchable = searchable;
}
this.supportType = supportType;
this.searchable = searchable;
}
@@
-144,7
+149,7
@@
public class GuiReaderSearchByNamePanel extends JPanel {
return storyItem;
}
return storyItem;
}
- private void fireAction() {
+ private void fireAction(
final Runnable inUi
) {
GuiReaderSearchFrame.inUi(new Runnable() {
@Override
public void run() {
GuiReaderSearchFrame.inUi(new Runnable() {
@Override
public void run() {
@@
-164,6
+169,10
@@
public class GuiReaderSearchByNamePanel extends JPanel {
GuiReaderSearchFrame.error(e);
}
}
GuiReaderSearchFrame.error(e);
}
}
+
+ if (inUi != null) {
+ inUi.run();
+ }
}
});
}
}
});
}
@@
-329,7
+338,7
@@
public class GuiReaderSearchByNamePanel extends JPanel {
stories = new ArrayList<MetaData>();
}
stories = new ArrayList<MetaData>();
}
- fireAction();
+ fireAction(
null
);
}
}
}).start();
}
}
}).start();
@@
-367,7
+376,7
@@
public class GuiReaderSearchByNamePanel extends JPanel {
// item 0 = no selection, else = default selection
// return: maxpage
// item 0 = no selection, else = default selection
// return: maxpage
- public int search(String keywords, int item) {
+ public int search(String keywords, int item
, Runnable inUi
) {
List<MetaData> stories = new ArrayList<MetaData>();
int storyItem = 0;
List<MetaData> stories = new ArrayList<MetaData>();
int storyItem = 0;
@@
-400,14
+409,14
@@
public class GuiReaderSearchByNamePanel extends JPanel {
this.stories = stories;
this.storyItem = storyItem;
this.stories = stories;
this.storyItem = storyItem;
- fireAction();
+ fireAction(
inUi
);
return maxPage;
}
// tag: null = base tags
// return: max pages
return maxPage;
}
// tag: null = base tags
// return: max pages
- public int searchTag(SearchableTag tag, int item) {
+ public int searchTag(SearchableTag tag, int item
, Runnable inUi
) {
List<MetaData> stories = new ArrayList<MetaData>();
int storyItem = 0;
List<MetaData> stories = new ArrayList<MetaData>();
int storyItem = 0;
@@
-461,7
+470,7
@@
public class GuiReaderSearchByNamePanel extends JPanel {
this.stories = stories;
this.storyItem = storyItem;
this.stories = stories;
this.storyItem = storyItem;
- fireAction();
+ fireAction(
inUi
);
return maxPage;
}
return maxPage;
}