remote/general: import should not retrieve story from server

[fanfix.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 3153dea106b3c03e819aa5ab32492952e95672ca..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
         */
-       public interface StoryRunnable {
+       public interface MetaDataRunnable {
                /**
                 * Run the action.
                 * 
-                * @param story
-                *            the story
+                * @param meta
+                *            the meta of the story
                 */
-               public void run(Story story);
+               public void run(MetaData meta);
        }
 
        /**
@@ -138,6 +138,7 @@ class GuiReaderMainPanel extends JPanel {
 
                pane = new JPanel();
                pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
+               JScrollPane scroll = new JScrollPane(pane);
 
                Integer icolor = Instance.getUiConfig().getColor(
                                UiConfig.BACKGROUND_COLOR);
@@ -145,9 +146,9 @@ class GuiReaderMainPanel extends JPanel {
                        color = new Color(icolor);
                        setBackground(color);
                        pane.setBackground(color);
+                       scroll.setBackground(color);
                }
 
-               JScrollPane scroll = new JScrollPane(pane);
                scroll.getVerticalScrollBar().setUnitIncrement(16);
                add(scroll, BorderLayout.CENTER);
 
@@ -547,7 +548,7 @@ class GuiReaderMainPanel extends JPanel {
         * @param onSuccessPgName
         *            the name to use for the onSuccess progress bar
         */
-       public void imprt(final String url, final StoryRunnable onSuccess,
+       public void imprt(final String url, final MetaDataRunnable onSuccess,
                        String onSuccessPgName) {
                final Progress pg = new Progress();
                final Progress pgImprt = new Progress();
@@ -559,9 +560,9 @@ class GuiReaderMainPanel extends JPanel {
                        @Override
                        public void run() {
                                Exception ex = null;
-                               Story story = null;
+                               MetaData meta = null;
                                try {
-                                       story = helper.getReader().getLibrary()
+                                       meta = helper.getReader().getLibrary()
                                                        .imprt(BasicReader.getUrl(url), pgImprt);
                                } catch (IOException e) {
                                        ex = e;
@@ -585,7 +586,7 @@ class GuiReaderMainPanel extends JPanel {
                                        }
                                } else {
                                        if (onSuccess != null) {
-                                               onSuccess.run(story);
+                                               onSuccess.run(meta);
                                        }
                                }
                                pgOnSuccess.done();