Add more warnings source to 1.6) and fix warnings

[nikiroo-utils.git] / src / be / nikiroo / utils / ui / ProgressBar.java

diff --git a/src/be/nikiroo/utils/ui/ProgressBar.java b/src/be/nikiroo/utils/ui/ProgressBar.java
index 6e1e44a9f7057748389047c5d7def8c0aabf7982..2c91c70dcd5db543285816353841fe9fee7e8337 100644 (file)
--- a/src/be/nikiroo/utils/ui/ProgressBar.java
+++ b/src/be/nikiroo/utils/ui/ProgressBar.java
@@ -39,6 +39,7 @@ public class ProgressBar extends JPanel {
                this.pg = pg;
 
                SwingUtilities.invokeLater(new Runnable() {
+                       @Override
                        public void run() {
                                if (pg != null) {
                                        final JProgressBar bar = new JProgressBar();
@@ -53,9 +54,11 @@ public class ProgressBar extends JPanel {
                                        bar.setString(pg.getName());
 
                                        pg.addProgressListener(new Progress.ProgressListener() {
+                                               @Override
                                                public void progress(Progress progress, String name) {
                                                        final Progress.ProgressListener l = this;
                                                        SwingUtilities.invokeLater(new Runnable() {
+                                                               @Override
                                                                public void run() {
                                                                        Map<Progress, JProgressBar> newBars = new HashMap<Progress, JProgressBar>();
                                                                        newBars.put(pg, bar);
@@ -65,19 +68,20 @@ public class ProgressBar extends JPanel {
                                                                        bar.setValue(pg.getProgress());
                                                                        bar.setString(pg.getName());
 
-                                                                       for (Progress pg : getChildrenAsOrderedList(pg)) {
-                                                                               JProgressBar bar = bars.get(pg);
-                                                                               if (bar == null) {
-                                                                                       bar = new JProgressBar();
-                                                                                       bar.setStringPainted(true);
+                                                                       for (Progress pgChild : getChildrenAsOrderedList(pg)) {
+                                                                               JProgressBar barChild = bars
+                                                                                               .get(pgChild);
+                                                                               if (barChild == null) {
+                                                                                       barChild = new JProgressBar();
+                                                                                       barChild.setStringPainted(true);
                                                                                }
 
-                                                                               newBars.put(pg, bar);
+                                                                               newBars.put(pgChild, barChild);
 
-                                                                               bar.setMinimum(pg.getMin());
-                                                                               bar.setMaximum(pg.getMax());
-                                                                               bar.setValue(pg.getProgress());
-                                                                               bar.setString(pg.getName());
+                                                                               barChild.setMinimum(pgChild.getMin());
+                                                                               barChild.setMaximum(pgChild.getMax());
+                                                                               barChild.setValue(pgChild.getProgress());
+                                                                               barChild.setString(pgChild.getName());
                                                                        }
 
                                                                        if (ProgressBar.this.pg == null) {