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 mostly OK
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
ui
/
GuiReader.java
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index c07579093d188b127179248c8bf6ad7304a25223..1d782129276aaa0744ab414b40b0b09ebd9662de 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@
-234,7
+234,16
@@
class GuiReader extends BasicReader {
@Override
public void search(SupportType searchOn, String keywords, int page,
int item, boolean sync) {
@Override
public void search(SupportType searchOn, String keywords, int page,
int item, boolean sync) {
- GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
+ final GuiReaderSearchFrame search = new GuiReaderSearchFrame(
+ GuiReader.this);
+ while (!search.isEnabled()) {
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ Instance.getTraceHandler().error(e);
+ }
+ }
+
search.search(searchOn, keywords, page, item);
if (sync) {
sync(search);
search.search(searchOn, keywords, page, item);
if (sync) {
sync(search);
@@
-247,7
+256,16
@@
class GuiReader extends BasicReader {
public void searchTag(final SupportType searchOn, final int page,
final int item, final boolean sync, final Integer... tags) {
public void searchTag(final SupportType searchOn, final int page,
final int item, final boolean sync, final Integer... tags) {
- final GuiReaderSearchFrame search = new GuiReaderSearchFrame(GuiReader.this);
+ final GuiReaderSearchFrame search = new GuiReaderSearchFrame(
+ GuiReader.this);
+ while (!search.isEnabled()) {
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ Instance.getTraceHandler().error(e);
+ }
+ }
+
final BasicSearchable searchable = BasicSearchable
.getSearchable(searchOn);
final BasicSearchable searchable = BasicSearchable
.getSearchable(searchOn);
@@
-257,9
+275,6
@@
class GuiReader extends BasicReader {
SearchableTag tag = null;
try {
tag = searchable.getTag(tags);
SearchableTag tag = null;
try {
tag = searchable.getTag(tags);
- if (tag != null) {
- searchable.fillTag(tag);
- }
} catch (IOException e) {
Instance.getTraceHandler().error(e);
}
} catch (IOException e) {
Instance.getTraceHandler().error(e);
}