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: code reorg step 0
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
ui
/
GuiReaderSearchFrame.java
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchFrame.java
similarity index 96%
rename from
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
rename to
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchFrame.java
index 50d3d82f4b80f23b6291da3c61e0166969412626..dcbf92740586466635177aa0fb781589f068a816 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchFrame.java
@@
-38,7
+38,7
@@
import be.nikiroo.fanfix.supported.SupportType;
*/
// JCombobox<E> not 1.6 compatible
@SuppressWarnings({ "unchecked", "rawtypes" })
*/
// JCombobox<E> not 1.6 compatible
@SuppressWarnings({ "unchecked", "rawtypes" })
-public class GuiReaderSearch extends JFrame {
+public class GuiReaderSearch
Frame
extends JFrame {
private static final long serialVersionUID = 1L;
private List<SupportType> supportTypes;
private static final long serialVersionUID = 1L;
private List<SupportType> supportTypes;
@@
-59,7
+59,7
@@
public class GuiReaderSearch extends JFrame {
private boolean seeWordcount;
private GuiReaderGroup books;
private boolean seeWordcount;
private GuiReaderGroup books;
- public GuiReaderSearch(final GuiReader reader) {
+ public GuiReaderSearch
Frame
(final GuiReader reader) {
super("Browse stories");
setLayout(new BorderLayout());
setSize(800, 600);
super("Browse stories");
setLayout(new BorderLayout());
setSize(800, 600);
@@
-183,8
+183,8
@@
public class GuiReaderSearch extends JFrame {
inUi(new Runnable() {
@Override
public void run() {
inUi(new Runnable() {
@Override
public void run() {
- GuiReaderSearch.this.page = page;
- GuiReaderSearch.this.maxPage = maxPage;
+ GuiReaderSearch
Frame
.this.page = page;
+ GuiReaderSearch
Frame
.this.maxPage = maxPage;
// TODO: gui
System.out.println("page: " + page);
System.out.println("max page: " + maxPage);
// TODO: gui
System.out.println("page: " + page);
System.out.println("max page: " + maxPage);
@@
-198,7
+198,7
@@
public class GuiReaderSearch extends JFrame {
inUi(new Runnable() {
@Override
public void run() {
inUi(new Runnable() {
@Override
public void run() {
- GuiReaderSearch.this.keywords = keywords;
+ GuiReaderSearch
Frame
.this.keywords = keywords;
keywordsField.setText(keywords);
}
});
keywordsField.setText(keywords);
}
});
@@
-532,7
+532,7
@@
public class GuiReaderSearch extends JFrame {
* @param run
* the action to run
*/
* @param run
* the action to run
*/
-
private
void inUi(final Runnable run) {
+
static
void inUi(final Runnable run) {
if (EventQueue.isDispatchThread()) {
run.run();
} else {
if (EventQueue.isDispatchThread()) {
run.run();
} else {
@@
-546,15
+546,19
@@
public class GuiReaderSearch extends JFrame {
}
}
}
}
-
private
void error(Exception e) {
+
static
void error(Exception e) {
Instance.getTraceHandler().error(e);
}
Instance.getTraceHandler().error(e);
}
+ static void error(String e) {
+ Instance.getTraceHandler().error(e);
+ }
+
private void setWaitingScreen(final boolean waiting) {
inUi(new Runnable() {
@Override
public void run() {
private void setWaitingScreen(final boolean waiting) {
inUi(new Runnable() {
@Override
public void run() {
- GuiReaderSearch.this.setEnabled(!waiting);
+ GuiReaderSearch
Frame
.this.setEnabled(!waiting);
books.setEnabled(!waiting);
submitKeywords.setEnabled(!waiting);
}
books.setEnabled(!waiting);
submitKeywords.setEnabled(!waiting);
}