Fix progress tests, update Progress jDoc

diff --git a/src/be/nikiroo/utils/Progress.java b/src/be/nikiroo/utils/Progress.java
index a8940fc00816cb8a84a596faef013fcc0b35d2c8..62e46874c3e0918ff49877f74b4d7314bae0be83 100644 (file)
--- a/src/be/nikiroo/utils/Progress.java
+++ b/src/be/nikiroo/utils/Progress.java
@@ -19,7 +19,10 @@ public class Progress {
                 * A progression event.
                 * 
                 * @param progress
-                *            the {@link Progress} object that generated it
+                *            the {@link Progress} object that generated it, not
+                *            necessarily the same as the one where the listener was
+                *            attached (it could be a child {@link Progress} of this
+                *            {@link Progress}).
                 * @param name
                 *            the first non-null name of the {@link Progress} step that
                 *            generated this event
@@ -257,6 +260,10 @@ public class Progress {
 
        /**
         * Add a {@link ProgressListener} that will trigger on progress changes.
+        * <p>
+        * Note: the {@link Progress} that will be reported will be the active
+        * progress, not necessarily the same as the current one (it could be a
+        * child {@link Progress} of this {@link Progress}).
         * 
         * @param l
         *            the listener

diff --git a/src/be/nikiroo/utils/test/ProgressTest.java b/src/be/nikiroo/utils/test/ProgressTest.java
index ff46bd6944d6df4721858c2d012c3a3b2ea3fb40..c6979739a1ac19fa98e065934170daa3b0c3ea3e 100644 (file)
--- a/src/be/nikiroo/utils/test/ProgressTest.java
+++ b/src/be/nikiroo/utils/test/ProgressTest.java
@@ -95,7 +95,7 @@ class ProgressTest extends TestLauncher {
 
                                        @Override
                                        public void test() throws Exception {
-                                               Progress p = new Progress();
+                                               final Progress p = new Progress();
                                                Progress child1 = new Progress();
                                                Progress child2 = new Progress();
                                                p.addProgress(child1, 50);
@@ -103,7 +103,7 @@ class ProgressTest extends TestLauncher {
 
                                                p.addProgressListener(new Progress.ProgressListener() {
                                                        public void progress(Progress progress, String name) {
-                                                               pg = progress.getProgress();
+                                                               pg = p.getProgress();
                                                        }
                                                });
 
@@ -121,7 +121,7 @@ class ProgressTest extends TestLauncher {
 
                                        @Override
                                        public void test() throws Exception {
-                                               Progress p = new Progress();
+                                               final Progress p = new Progress();
                                                p.setMax(1000);
 
                                                Progress child1 = new Progress();
@@ -133,7 +133,7 @@ class ProgressTest extends TestLauncher {
 
                                                p.addProgressListener(new Progress.ProgressListener() {
                                                        public void progress(Progress progress, String name) {
-                                                               pg = progress.getProgress();
+                                                               pg = p.getProgress();
                                                        }
                                                });
 
@@ -152,7 +152,7 @@ class ProgressTest extends TestLauncher {
 
                                        @Override
                                        public void test() throws Exception {
-                                               Progress p = new Progress();
+                                               final Progress p = new Progress();
                                                p.setMax(1000);
 
                                                Progress child1 = new Progress();
@@ -165,7 +165,7 @@ class ProgressTest extends TestLauncher {
 
                                                p.addProgressListener(new Progress.ProgressListener() {
                                                        public void progress(Progress progress, String name) {
-                                                               pg = progress.getProgress();
+                                                               pg = p.getProgress();
                                                        }
                                                });