Content downloader UI overhaul:

- Updated to skin themes
- Incorporated into overlay
- Moved card scanning to worker thread
- Improved general responsiveness

src/main/java/forge/AllZone.java

@@ -26,6 +26,7 @@ import forge.card.replacement.ReplacementHandler;
 import forge.card.trigger.TriggerHandler;
 import forge.control.input.InputControl;
 import forge.game.GameState;
+import forge.game.limited.GauntletMini;
 import forge.game.phase.Combat;
 import forge.game.phase.EndOfTurn;
 import forge.game.player.Player;
@@ -35,7 +36,6 @@ import forge.game.zone.ZoneType;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.quest.QuestController;
-import forge.game.limited.GauntletMini;
 
 
 /**

src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java

@@ -19,7 +19,6 @@ package forge.gui.download;
 
 import java.io.File;
 import java.util.ArrayList;
-import javax.swing.JFrame;
 
 import forge.card.CardRules;
 import forge.gui.GuiDisplayUtil;
@@ -42,9 +41,12 @@ public class GuiDownloadPicturesLQ extends GuiDownloader {
     private String baseFolder;
     private ArrayList<DownloadObject> downloads;
 
-    public GuiDownloadPicturesLQ(final JFrame frame) {
+    /**
-        super(frame);
+     * 
-
+     * TODO: Write javadoc for this method.
+     */
+    public GuiDownloadPicturesLQ() {
+        super();
     }
 
     /**
@@ -56,25 +58,22 @@ public class GuiDownloadPicturesLQ extends GuiDownloader {
      */
     @Override
     protected final DownloadObject[] getNeededImages() {
-
         // This is called as a virtual method from constructor.
         baseFolder = ForgeProps.getFile(NewConstants.IMAGE_BASE).getPath();
         downloads = new ArrayList<DownloadObject>();
 
-        // It is already needed here as initialized variable - that was the best place to initialize
-        
         for (final CardPrinted c : CardDb.instance().getAllUniqueCards()) {
             //System.out.println(c.getName());
             CardRules firstSide = c.getCard();
             this.createDLObjects(firstSide);
 
             CardRules secondSide = firstSide.getSlavePart();
-            if( secondSide != null )
+            if (secondSide != null) {
                 this.createDLObjects(secondSide);
             }
+        }
 
-
+        // Add missing tokens to the list of things to download.
-        // add missing tokens to the list of things to download
         for (final DownloadObject element : GuiDownloader.readFileWithNames(NewConstants.TOKEN_IMAGES,
                 ForgeProps.getFile(NewConstants.IMAGE_TOKEN))) {
             if (!element.getDestination().exists()) {
@@ -82,7 +81,7 @@ public class GuiDownloadPicturesLQ extends GuiDownloader {
             }
         }
 
-        // return all card names and urls that are needed
+        // Return all card names and URLs that are needed.
         return downloads.toArray(new DownloadObject[downloads.size()]);
     } // getNeededImages()
 

src/main/java/forge/gui/download/GuiDownloadPrices.java

@@ -19,28 +19,18 @@ package forge.gui.download;
 
 import java.io.File;
 
-import javax.swing.JFrame;
-
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 
-/**
+/** */
- * <p>
- * Gui_DownloadPrices class.
- * </p>
- * 
- * @author Forge
- * @version $Id$
- */
 @SuppressWarnings("serial")
 public class GuiDownloadPrices extends GuiDownloader {
 
     /**
-     * TODO: Write javadoc for Constructor.
+     * Constructor.
-     * @param frame {@link javax.swing.JFrame}
      */
-    public GuiDownloadPrices(final JFrame frame) {
+    public GuiDownloadPrices() {
-        super(frame);
+        super();
     }
 
     /* (non-Javadoc)

src/main/java/forge/gui/download/GuiDownloadQuestImages.java

@@ -20,32 +20,19 @@ package forge.gui.download;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.JFrame;
-
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 
-/**
+/** */
- * <p>
+@SuppressWarnings("serial")
- * GuiDownloadQuestImages class.
- * </p>
- * 
- * @author Forge
- */
 public class GuiDownloadQuestImages extends GuiDownloader {
-
-    private static final long serialVersionUID = -8596808503046590349L;
-
     /**
      * <p>
      * Constructor for GuiDownloadQuestImages.
      * </p>
-     * 
-     * @param frame
-     *            a array of {@link javax.swing.JFrame} objects.
      */
-    public GuiDownloadQuestImages(final JFrame frame) {
+    public GuiDownloadQuestImages() {
-        super(frame);
+        super();
     }
 
     /**

src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java

@@ -20,8 +20,6 @@ package forge.gui.download;
 import java.io.File;
 import java.util.ArrayList;
 
-import javax.swing.JFrame;
-
 import org.apache.commons.lang3.StringUtils;
 
 import forge.CardUtil;
@@ -33,30 +31,18 @@ import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.util.Base64Coder;
 
-/**
+/** */
- * <p>
+@SuppressWarnings("serial")
- * Gui_DownloadSetPictures_LQ class.
- * </p>
- * 
- * @author Forge
- * @version $Id$
- */
 public class GuiDownloadSetPicturesLQ extends GuiDownloader {
-
-    private static final long serialVersionUID = -7890794857949935256L;
     private String picturesPath;
 
     /**
      * <p>
      * Constructor for Gui_DownloadSetPictures_LQ.
      * </p>
-     * 
-     * @param frame
-     *            a {@link javax.swing.JFrame} object.
      */
-    public GuiDownloadSetPicturesLQ(final JFrame frame) {
+    public GuiDownloadSetPicturesLQ() {
-        super(frame);
+        super();
-
     }
 
     /**

src/main/java/forge/gui/download/GuiDownloader.java

@@ -17,7 +17,6 @@
  */
 package forge.gui.download;
 
-import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -37,79 +36,168 @@ import java.util.Random;
 import java.util.regex.Pattern;
 
 import javax.swing.AbstractButton;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
 import javax.swing.DefaultBoundedRangeModel;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JProgressBar;
 import javax.swing.JRadioButton;
 import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.SwingWorker;
+import javax.swing.border.LineBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import net.miginfocom.swing.MigLayout;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.esotericsoftware.minlog.Log;
 
+import forge.Command;
 import forge.error.ErrorViewer;
+import forge.gui.SOverlayUtils;
+import forge.gui.toolbox.FButton;
+import forge.gui.toolbox.FLabel;
+import forge.gui.toolbox.FOverlay;
+import forge.gui.toolbox.FPanel;
+import forge.gui.toolbox.FProgressBar;
+import forge.gui.toolbox.FRadioButton;
+import forge.gui.toolbox.FSkin;
 import forge.properties.ForgeProps;
 import forge.properties.NewConstants;
 import forge.util.FileUtil;
 import forge.util.MyRandom;
 
-/**
+/** */
- * <p>
+@SuppressWarnings("serial")
- * GuiDownloadQuestImages class.
- * </p>
- * 
- * @author Forge
- */
 public abstract class GuiDownloader extends DefaultBoundedRangeModel implements Runnable {
 
-    private static final long serialVersionUID = -8596808503046590349L;
+    /** */
+    public static final Proxy.Type[] TYPES = Proxy.Type.values(); /** */
 
-    /** Constant <code>types</code>. */
+    // Actions and commands
-    public static final Proxy.Type[] TYPES = Proxy.Type.values();
+    private final ActionListener actStartDownload = new ActionListener() {
+        @Override
+        public void actionPerformed(final ActionEvent e) {
+            new Thread(GuiDownloader.this).start();
+            btnStart.setEnabled(false);
+        }
+    };
 
-    // proxy
+    private final ActionListener actOK = new ActionListener() {
-    /** The type. */
+        @Override
-    private int type;
+        public void actionPerformed(final ActionEvent e) {
+            close();
+        }
+    };
 
-    /** The port. */
+    private final Command cmdClose = new Command() { @Override
-    private JTextField addr, port;
+        public void execute() { close(); } };
 
-    // progress
+    // Swing components
-    /** The cards. */
+    private final FPanel pnlDialog = new FPanel(new MigLayout("insets 0, gap 0, wrap, ax center, ay center"));
-    private DownloadObject[] cards;
+    private final FProgressBar barProgress = new FProgressBar();
+    private final FButton btnStart = new FButton("Start");
+    private final JTextField txfAddr = new JTextField(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.PROXY_ADDRESS));
+    private final JTextField txfPort = new JTextField(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.PROXY_PORT));
 
-    /** The card. */
+    private final FLabel btnClose = new FLabel.Builder().text("X")
-    private int card;
+            .hoverable(true).fontAlign(SwingConstants.CENTER).cmdClick(cmdClose).build();
 
-    /** The cancel. */
+    private final JRadioButton radProxyNone = new FRadioButton(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.NO_PROXY));
-    private boolean cancel;
+    private final JRadioButton radProxySocks = new FRadioButton(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.SOCKS_PROXY));
+    private final JRadioButton radProxyHTTP = new FRadioButton(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.HTTP_PROXY));
 
-    /** The bar. */
+    // Proxy info
-    private JProgressBar bar;
+    private int type; /** */
 
-    /** The dlg. */
+    // Progress variables
-    private JOptionPane dlg;
+    private DownloadObject[] cards; /** */
+    private int card; /** */
+    private boolean cancel; /** */
+    private final long[] times = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; /** */
+    private int tptr = 0; /** */
+    private long lTime = System.currentTimeMillis(); /** */
 
-    /** The close. */
+    /** Constructor. */
-    private JButton close;
+    protected GuiDownloader() {
+        final ButtonGroup grpRad = new ButtonGroup();
+        grpRad.add(radProxyNone);
+        grpRad.add(radProxyHTTP);
+        grpRad.add(radProxySocks);
 
-    /** The times. */
+        radProxyNone.addChangeListener(new ProxyHandler(0));
-    private final long[] times = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        radProxyHTTP.addChangeListener(new ProxyHandler(1));
+        radProxySocks.addChangeListener(new ProxyHandler(2));
+        radProxyNone.setSelected(true);
 
-    /** The tptr. */
+        btnClose.setBorder(new LineBorder(FSkin.getColor(FSkin.Colors.CLR_TEXT), 1));
-    private int tptr = 0;
+        btnStart.setFont(FSkin.getFont(18));
+        btnStart.setVisible(false);
 
-    /** The l time. */
+        barProgress.reset();
-    private long lTime = System.currentTimeMillis();
+        barProgress.setString("Scanning for existing images...");
+        pnlDialog.setBackgroundTexture(FSkin.getIcon(FSkin.Backgrounds.BG_TEXTURE));
+
+        // Layout
+        pnlDialog.add(radProxyNone, "w 50%!, h 30px!, gap 2% 0 0 10px");
+        pnlDialog.add(radProxyHTTP, "w 50%!, h 30px!, gap 2% 0 0 10px");
+        pnlDialog.add(radProxySocks, "w 50%!, h 30px!, gap 2% 0 0 10px");
+        pnlDialog.add(txfAddr, "w 95%!, h 30px!, gap 2% 0 0 10px");
+        pnlDialog.add(txfPort, "w 95%!, h 30px!, gap 2% 0 0 10px");
+        pnlDialog.add(barProgress, "w 95%!, h 40px!, gap 2% 0 20px 0");
+        pnlDialog.add(btnStart, "w 200px!, h 40px!, gap 0 0 20px 0, ax center");
+        pnlDialog.add(btnClose, "w 20px!, h 20px!, pos 370px 10px");
+
+        final JPanel pnl = FOverlay.SINGLETON_INSTANCE.getPanel();
+        pnl.removeAll();
+        pnl.setLayout(new MigLayout("insets 0, gap 0, wrap, ax center, ay center"));
+        pnl.add(pnlDialog, "w 400px!, h 350px!, ax center, ay center");
+        SOverlayUtils.showOverlay();
+
+        // Free up the EDT by assembling card list in the background
+        SwingWorker<Void, Void> thrGetImages = new SwingWorker<Void, Void>() {
+            @Override
+            protected Void doInBackground() throws Exception {
+                GuiDownloader.this.cards = GuiDownloader.this.getNeededImages();
+                return null;
+            }
+
+            @Override
+            protected void done() {
+                GuiDownloader.this.readyToStart();
+            }
+        };
+
+        thrGetImages.execute();
+    }
+
+    private void readyToStart() {
+        if (this.cards.length == 0) {
+            barProgress.setString("All images have been downloaded.");
+            btnStart.setVisible(true);
+            btnStart.setText("OK");
+            btnStart.addActionListener(actOK);
+        }
+        else {
+            barProgress.setMaximum(this.cards.length);
+            barProgress.setString(this.cards.length + " images found.");
+            btnStart.setVisible(true);
+            btnStart.addActionListener(actStartDownload);
+        }
+    }
+
+    private void setCancel(final boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    private void close() {
+        setCancel(true);
+
+        // Kill overlay
+        SOverlayUtils.hideOverlay();
+        FOverlay.SINGLETON_INSTANCE.getPanel().removeAll();
+    }
 
     /**
      * <p>
@@ -143,109 +231,6 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
         return aTime;
     }
 
-    /**
-     * <p>
-     * Constructor for GuiDownloader.
-     * </p>
-     * 
-     * @param frame
-     *            a {@link javax.swing.JFrame} object.
-     */
-    protected GuiDownloader(final JFrame frame) {
-
-        this.cards = this.getNeededImages();
-
-        if (this.cards.length == 0) {
-            JOptionPane
-                    .showMessageDialog(frame, ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.NO_MORE));
-            return;
-        }
-
-        this.addr = new JTextField(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.PROXY_ADDRESS));
-        this.port = new JTextField(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.PROXY_PORT));
-        this.bar = new JProgressBar(this);
-
-        final JPanel p0 = new JPanel();
-        p0.setLayout(new BoxLayout(p0, BoxLayout.Y_AXIS));
-
-        // Proxy Choice
-        final ButtonGroup bg = new ButtonGroup();
-        final String[] labels = { ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.NO_PROXY),
-                ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.HTTP_PROXY),
-                ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.SOCKS_PROXY) };
-        for (int i = 0; i < GuiDownloader.TYPES.length; i++) {
-            final JRadioButton rb = new JRadioButton(labels[i]);
-            rb.addChangeListener(new ProxyHandler(i));
-            bg.add(rb);
-            p0.add(rb);
-            if (i == 0) {
-                rb.setSelected(true);
-            }
-        }
-
-        // Proxy config
-        p0.add(this.addr);
-        p0.add(this.port);
-
-        // Start
-        final JButton b = new JButton(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.Buttons.START));
-        b.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                new Thread(GuiDownloader.this).start();
-                b.setEnabled(false);
-            }
-        });
-
-        p0.add(Box.createVerticalStrut(5));
-
-        // Progress
-        p0.add(this.bar);
-        this.bar.setStringPainted(true);
-        // bar.setString(ForgeProps.getLocalized(BAR_BEFORE_START));
-        this.bar.setString(this.card + "/" + this.cards.length);
-        // bar.setString(String.format(ForgeProps.getLocalized(card ==
-        // cards.length? BAR_CLOSE:BAR_WAIT), this.card, cards.length));
-        final Dimension d = this.bar.getPreferredSize();
-        d.width = 300;
-        this.bar.setPreferredSize(d);
-
-        // JOptionPane
-        this.close = new JButton(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.Buttons.CANCEL));
-        final Object[] options = { b, this.close };
-        this.dlg = new JOptionPane(p0, JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null, options, options[1]);
-
-        final JDialog jdlg = this.getDlg(frame);
-        jdlg.setVisible(true);
-        jdlg.dispose();
-        this.setCancel(true);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final int getMinimum() {
-        return 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final int getValue() {
-        return this.card;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final int getExtent() {
-        return 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final int getMaximum() {
-        return this.cards == null ? 0 : this.cards.length;
-    }
-
     /**
      * <p>
      * update.
@@ -313,46 +298,13 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
                             this.card, GuiDownloader.this.cards.length));
                 }
 
-                GuiDownloader.this.bar.setString(sb.toString());
+                GuiDownloader.this.barProgress.setString(sb.toString());
                 System.out.println(this.card + "/" + GuiDownloader.this.cards.length + " - " + a);
             }
         }
         EventQueue.invokeLater(new Worker(card));
     }
 
-    /**
-     * <p>
-     * Getter for the field <code>dlg</code>.
-     * </p>
-     * 
-     * @param frame
-     *            a {@link javax.swing.JFrame} object.
-     * @return a {@link javax.swing.JDialog} object.
-     */
-    private JDialog getDlg(final JFrame frame) {
-        final JDialog dlg = this.dlg.createDialog(frame,
-                ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.TITLE));
-        this.close.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                dlg.setVisible(false);
-            }
-        });
-        return dlg;
-    }
-
-    /**
-     * <p>
-     * Setter for the field <code>cancel</code>.
-     * </p>
-     * 
-     * @param cancel
-     *            a boolean.
-     */
-    public final void setCancel(final boolean cancel) {
-        this.cancel = cancel;
-    }
-
     /**
      * <p>
      * run.
@@ -370,12 +322,12 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
             p = Proxy.NO_PROXY;
         } else {
             try {
-                p = new Proxy(GuiDownloader.TYPES[this.type], new InetSocketAddress(this.addr.getText(),
+                p = new Proxy(GuiDownloader.TYPES[this.type], new InetSocketAddress(this.txfAddr.getText(),
-                        Integer.parseInt(this.port.getText())));
+                        Integer.parseInt(this.txfPort.getText())));
             } catch (final Exception ex) {
                 ErrorViewer.showError(ex,
                         ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.Errors.PROXY_CONNECT),
-                        this.addr.getText(), this.port.getText());
+                        this.txfAddr.getText(), this.txfPort.getText());
                 return;
             }
         }
@@ -407,7 +359,7 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
 
                             // delete what was written so far
                             fileDest.delete();
-
+                            this.close();
                             return;
                         } // if - cancel
 
@@ -436,7 +388,6 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
                 }
             } // for
         }
-        this.close.setText(ForgeProps.getLocalized(NewConstants.Lang.GuiDownloadPictures.Buttons.CLOSE));
     } // run
 
     /**
@@ -543,8 +494,8 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
         public final void stateChanged(final ChangeEvent e) {
             if (((AbstractButton) e.getSource()).isSelected()) {
                 GuiDownloader.this.type = this.type;
-                GuiDownloader.this.addr.setEnabled(this.type != 0);
+                GuiDownloader.this.txfAddr.setEnabled(this.type != 0);
-                GuiDownloader.this.port.setEnabled(this.type != 0);
+                GuiDownloader.this.txfPort.setEnabled(this.type != 0);
             }
         }
     }
@@ -557,16 +508,22 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
         private final String source;
         private final File destination;
 
+        /**
+         * @param srcUrl {@link java.lang.String}
+         * @param destFile {@link java.io.File}
+         */
         DownloadObject(final String srcUrl, final File destFile) {
             source = srcUrl;
             destination = destFile;
             // System.out.println("Created download object: "+name+" "+url+" "+dir);
         }
 
+        /** @return {@link java.lang.String} */
         public String getSource() {
             return source;
         }
 
+        /** @return {@link java.io.File} */
         public File getDestination() {
             return destination;
         }

src/main/java/forge/gui/home/utilities/CSubmenuUtilities.java

@@ -23,13 +23,13 @@ public enum CSubmenuUtilities implements ICDoc {
     private final Command cmdLicensing = new Command() { @Override
         public void execute() { VSubmenuUtilities.SINGLETON_INSTANCE.showLicensing(); } };
     private final Command cmdPicDownload  = new Command() { @Override
-        public void execute() { new GuiDownloadPicturesLQ(null); } };
+        public void execute() { new GuiDownloadPicturesLQ(); } };
     private final Command cmdSetDownload = new Command() { @Override
-        public void execute() { new GuiDownloadSetPicturesLQ(null); } };
+        public void execute() { new GuiDownloadSetPicturesLQ(); } };
     private final Command cmdQuestImages = new Command() { @Override
-        public void execute() { new GuiDownloadQuestImages(null); } };
+        public void execute() { new GuiDownloadQuestImages(); } };
     private final Command cmdDownloadPrices = new Command() { @Override
-        public void execute() { new GuiDownloadPrices(null); } };
+        public void execute() { new GuiDownloadPrices(); } };
     private final Command cmdHowToPlay = new Command() { @Override
         public void execute() { VSubmenuUtilities.SINGLETON_INSTANCE.showHowToPlay(); } };
 

src/main/java/forge/gui/toolbox/FProgressBar.java

@@ -47,14 +47,16 @@ public class FProgressBar extends JProgressBar {
 
         // String.format leads to StringBuilder anyway. Direct calls will be faster
         StringBuilder sb = new StringBuilder(desc);
-        if ( showCount ) sb.append(" ").append(tempVal).append(" of ").append(getMaximum());
+        if (showCount) {
+            sb.append(" ").append(tempVal).append(" of ").append(getMaximum());
+        }
+
         if (showETA) {
             calculateETA(tempVal);
             sb.append(", ETA").append(String.format("%02d:%02d:%02d", etaSecs / 3600, (etaSecs % 3600) / 60, etaSecs % 60 + 1));
         }
         message = sb.toString();
 
-    
         // When calculations finished; EDT can be used.
         SwingUtilities.invokeLater(new Runnable() {
             @Override
@@ -90,7 +92,7 @@ public class FProgressBar extends JProgressBar {
     /** */
     private void calculateETA(int v0) {
         float tempMillis = new Date().getTime();
-        float timePerUnit = (tempMillis - startMillis) / (float) v0;
+        float timePerUnit = (tempMillis - startMillis) / v0;
         etaSecs = (int) ((this.getMaximum() - v0) * timePerUnit) / 1000;
     }
 

src/test/java/forge/GuiDownloadPicturesLQTest.java

@@ -15,6 +15,6 @@ public class GuiDownloadPicturesLQTest {
      */
     @Test(enabled = false, timeOut = 1000)
     public void guiDownloadPicturesTest1() {
-        new GuiDownloadPicturesLQ(null);
+        new GuiDownloadPicturesLQ();
     }
 }

src/test/java/forge/GuiDownloadSetPicturesLQTest.java

@@ -15,6 +15,6 @@ public class GuiDownloadSetPicturesLQTest {
      */
     @Test(enabled = false, timeOut = 1000)
     public void g() {
-        new GuiDownloadSetPicturesLQ(null);
+        new GuiDownloadSetPicturesLQ();
     }
 }