git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remote/general: import should not retrieve story from server
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
ui
/
GuiReaderMainPanel.java
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
index 8593fe6471c816812220defeedf5775fe1757642..7caa243c411ca4bba0f4bf2c0dbbedd7368f8e07 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
@@
-108,18
+108,18
@@
class GuiReaderMainPanel extends JPanel {
}
/**
}
/**
- * A {@link Runnable} with a {@link
Story
} parameter.
+ * A {@link Runnable} with a {@link
MetaData
} parameter.
*
* @author niki
*/
*
* @author niki
*/
- public interface
Story
Runnable {
+ public interface
MetaData
Runnable {
/**
* Run the action.
*
/**
* Run the action.
*
- * @param
story
- * the story
+ * @param
meta
+ * the
meta of the
story
*/
*/
- public void run(
Story story
);
+ public void run(
MetaData meta
);
}
/**
}
/**
@@
-548,7
+548,7
@@
class GuiReaderMainPanel extends JPanel {
* @param onSuccessPgName
* the name to use for the onSuccess progress bar
*/
* @param onSuccessPgName
* the name to use for the onSuccess progress bar
*/
- public void imprt(final String url, final
Story
Runnable onSuccess,
+ public void imprt(final String url, final
MetaData
Runnable onSuccess,
String onSuccessPgName) {
final Progress pg = new Progress();
final Progress pgImprt = new Progress();
String onSuccessPgName) {
final Progress pg = new Progress();
final Progress pgImprt = new Progress();
@@
-560,9
+560,9
@@
class GuiReaderMainPanel extends JPanel {
@Override
public void run() {
Exception ex = null;
@Override
public void run() {
Exception ex = null;
-
Story story
= null;
+
MetaData meta
= null;
try {
try {
-
story
= helper.getReader().getLibrary()
+
meta
= helper.getReader().getLibrary()
.imprt(BasicReader.getUrl(url), pgImprt);
} catch (IOException e) {
ex = e;
.imprt(BasicReader.getUrl(url), pgImprt);
} catch (IOException e) {
ex = e;
@@
-586,7
+586,7
@@
class GuiReaderMainPanel extends JPanel {
}
} else {
if (onSuccess != null) {
}
} else {
if (onSuccess != null) {
- onSuccess.run(
story
);
+ onSuccess.run(
meta
);
}
}
pgOnSuccess.done();
}
}
pgOnSuccess.done();