git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0b39fb9
)
add sync option to search
author
Niki Roo
<niki@nikiroo.be>
Sat, 13 Apr 2019 11:43:00 +0000
(13:43 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Sat, 13 Apr 2019 11:43:00 +0000
(13:43 +0200)
src/be/nikiroo/fanfix/Main.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/reader/Reader.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/reader/cli/CliReader.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/reader/tui/TuiReader.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/reader/ui/GuiReader.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
patch
|
blob
|
blame
|
history
diff --git
a/src/be/nikiroo/fanfix/Main.java
b/src/be/nikiroo/fanfix/Main.java
index 6fc49c549764cbba0a7439086c49e79e981af3ad..2437cae567310700509c7c9a08a0a59212c7b1ec 100644
(file)
--- a/
src/be/nikiroo/fanfix/Main.java
+++ b/
src/be/nikiroo/fanfix/Main.java
@@
-501,7
+501,7
@@
public class Main {
} else {
try {
BasicReader.getReader().search(searchOn, search, page,
} else {
try {
BasicReader.getReader().search(searchOn, search, page,
- item);
+ item
, true
);
} catch (IOException e1) {
Instance.getTraceHandler().error(e1);
}
} catch (IOException e1) {
Instance.getTraceHandler().error(e1);
}
@@
-538,7
+538,7
@@
public class Main {
try {
BasicReader.getReader().searchTag(searchOn, page, item,
try {
BasicReader.getReader().searchTag(searchOn, page, item,
- tags.toArray(new Integer[] {}));
+ t
rue, t
ags.toArray(new Integer[] {}));
} catch (IOException e1) {
Instance.getTraceHandler().error(e1);
}
} catch (IOException e1) {
Instance.getTraceHandler().error(e1);
}
diff --git
a/src/be/nikiroo/fanfix/reader/Reader.java
b/src/be/nikiroo/fanfix/reader/Reader.java
index fa170e44fcc64a3233ec2c09cba93fb31e84cb07..bd13e5cb8c032e6866b72c30693d625eae0815e1 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/Reader.java
+++ b/
src/be/nikiroo/fanfix/reader/Reader.java
@@
-183,12
+183,15
@@
public interface Reader {
* @param item
* the item to select (0 = do not select a specific item but show
* all the page, items start at 1)
* @param item
* the item to select (0 = do not select a specific item but show
* all the page, items start at 1)
+ * @param sync
+ * execute the process synchronously (wait until it is terminated
+ * before returning)
*
* @throws IOException
* in case of I/O error
*/
*
* @throws IOException
* in case of I/O error
*/
- public void search(SupportType searchOn, String keywords, int page,
int item)
- throws IOException;
+ public void search(SupportType searchOn, String keywords, int page,
+
int item, boolean sync)
throws IOException;
/**
* Search based upon a hierarchy of tags, or search for (sub)tags.
/**
* Search based upon a hierarchy of tags, or search for (sub)tags.
@@
-212,6
+215,9
@@
public interface Reader {
* @param item
* the item to select (0 = do not select a specific item but show
* all the page, items <b>start at 1</b>)
* @param item
* the item to select (0 = do not select a specific item but show
* all the page, items <b>start at 1</b>)
+ * @param sync
+ * execute the process synchronously (wait until it is terminated
+ * before returning)
* @param tags
* the tags indices to search for (this is a tag
* <b>hierarchy</b>, <b>NOT</b> a multiple tags choice)
* @param tags
* the tags indices to search for (this is a tag
* <b>hierarchy</b>, <b>NOT</b> a multiple tags choice)
@@
-220,7
+226,7
@@
public interface Reader {
* in case of I/O error
*/
public void searchTag(SupportType searchOn, int page, int item,
* in case of I/O error
*/
public void searchTag(SupportType searchOn, int page, int item,
- Integer... tags) throws IOException;
+
boolean sync,
Integer... tags) throws IOException;
/**
* Open the {@link Story} with an external reader (the program should be
/**
* Open the {@link Story} with an external reader (the program should be
diff --git
a/src/be/nikiroo/fanfix/reader/cli/CliReader.java
b/src/be/nikiroo/fanfix/reader/cli/CliReader.java
index 6d9841830982533247e20dfcc8c5f2b9461a61af..bce2e2a456c09c1d3650fe01c7d5bb618273ee43 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/cli/CliReader.java
+++ b/
src/be/nikiroo/fanfix/reader/cli/CliReader.java
@@
-102,14
+102,14
@@
class CliReader extends BasicReader {
}
@Override
}
@Override
- public void search(SupportType searchOn, String keywords, int page,
int item)
- throws IOException {
+ public void search(SupportType searchOn, String keywords, int page,
+
int item, boolean sync)
throws IOException {
}
@Override
public void searchTag(SupportType searchOn, int page, int item,
}
@Override
public void searchTag(SupportType searchOn, int page, int item,
- Integer... tags) throws IOException {
+
boolean sync,
Integer... tags) throws IOException {
BasicSearchable search = BasicSearchable.getSearchable(searchOn);
List<SearchableTag> stags = search.getTags();
String fqnTag = "";
BasicSearchable search = BasicSearchable.getSearchable(searchOn);
List<SearchableTag> stags = search.getTags();
String fqnTag = "";
diff --git
a/src/be/nikiroo/fanfix/reader/tui/TuiReader.java
b/src/be/nikiroo/fanfix/reader/tui/TuiReader.java
index cc39dcde77e7173229c5cd597942e36721e6462b..640d628b3e32305a36089f6cfa25ed236dc7d83a 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/tui/TuiReader.java
+++ b/
src/be/nikiroo/fanfix/reader/tui/TuiReader.java
@@
-71,16
+71,22
@@
class TuiReader extends BasicReader {
Instance.getTraceHandler().error(e);
}
}
Instance.getTraceHandler().error(e);
}
}
-
+
@Override
@Override
- public void search(SupportType searchOn, String keywords, int page, int item) {
- // TODO: !!!
- throw new java.lang.IllegalStateException("Not implemented yet.");
+ public void search(SupportType searchOn, String keywords, int page,
+ int item, boolean sync) {
+ // TODO
+ if (sync) {
+ throw new java.lang.IllegalStateException("Not implemented yet.");
+ }
}
}
-
+
@Override
@Override
- public void searchTag(SupportType searchOn, int page, int item, String... tags) {
- // TODO: !!!
- throw new java.lang.IllegalStateException("Not implemented yet.");
+ public void searchTag(SupportType searchOn, int page, int item,
+ boolean sync, Integer... tags) {
+ // TODO
+ if (sync) {
+ throw new java.lang.IllegalStateException("Not implemented yet.");
+ }
}
}
}
}
diff --git
a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
index 85b1abcfb44f7af7419b757f21865b3f4ed8c3d2..6b8ce2b077b88eddfbb6c513343bfabad98508d7 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
+++ b/
src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
@@
-127,14
+127,15
@@
class TuiReaderApplication extends TApplication implements Reader {
}
@Override
}
@Override
- public void search(SupportType searchOn, String keywords, int page, int item) throws IOException {
- reader.search(searchOn, keywords, page, item);
+ public void search(SupportType searchOn, String keywords, int page,
+ int item, boolean sync) throws IOException {
+ reader.search(searchOn, keywords, page, item, sync);
}
@Override
public void searchTag(SupportType searchOn, int page, int item,
}
@Override
public void searchTag(SupportType searchOn, int page, int item,
- Integer... tags) throws IOException {
- reader.searchTag(searchOn, page, item, tags);
+
boolean sync,
Integer... tags) throws IOException {
+ reader.searchTag(searchOn, page, item,
sync,
tags);
}
/**
}
/**
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 2a4d7a942d4f67c5e7dd50553bb5ac9ba39de8f0..6c3a35e5198827c603393f4c5c77d5bea9f3b6d9 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@
-220,16
+220,21
@@
class GuiReader extends BasicReader {
}
@Override
}
@Override
- public void search(SupportType searchOn, String keywords, int page, int item) {
- // TODO: !!!
- throw new java.lang.IllegalStateException("Not implemented yet.");
+ public void search(SupportType searchOn, String keywords, int page,
+ int item, boolean sync) {
+ // TODO
+ if (sync) {
+ throw new java.lang.IllegalStateException("Not implemented yet.");
+ }
}
@Override
public void searchTag(SupportType searchOn, int page, int item,
}
@Override
public void searchTag(SupportType searchOn, int page, int item,
- Integer... tags) {
- // TODO: !!!
- throw new java.lang.IllegalStateException("Not implemented yet.");
+ boolean sync, Integer... tags) {
+ // TODO
+ if (sync) {
+ throw new java.lang.IllegalStateException("Not implemented yet.");
+ }
}
/**
}
/**
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
index 77cd7e019ef4363113e7605330c7ae82386fea7a..dd192fb070b96ac391e9ba6677421869766aeddb 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
@@
-192,7
+192,7
@@
class GuiReaderFrame extends JFrame implements FrameHelper {
searchItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
searchItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- reader.search(type, "", 1, 0);
+ reader.search(type, "", 1, 0
, false
);
}
});
search.add(searchItem);
}
});
search.add(searchItem);