Merge commit '087a6e8e7f1b0e63633831948e99ae110b92ae45'

[fanfix.git] / src / be / nikiroo / utils / Progress.java

diff --git a/src/be/nikiroo/utils/Progress.java b/src/be/nikiroo/utils/Progress.java
index 38ce29f9c8b49e6c4a27dd939fbf4d89d330817f..dea6be3fa011c351e4990b39e396368a50174e9d 100644 (file)
--- a/src/be/nikiroo/utils/Progress.java
+++ b/src/be/nikiroo/utils/Progress.java
@@ -6,7 +6,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
 /**
  * Progress reporting system, possibly nested.
@@ -139,7 +138,7 @@ public class Progress {
                        throw new RuntimeException("negative values not supported");
                }
 
-               synchronized (getLock()) {
+               synchronized (lock) {
                        if (min > max) {
                                throw new RuntimeException(
                                                "The minimum progress value must be <= the maximum progress value");
@@ -169,7 +168,7 @@ public class Progress {
         *             if max &lt; min
         */
        public void setMax(int max) {
-               synchronized (getLock()) {
+               synchronized (lock) {
                        if (max < min) {
                                throw new Error(
                                                "The maximum progress value must be >= the minimum progress value");
@@ -200,7 +199,7 @@ public class Progress {
                                        "The minimum progress value must be <= the maximum progress value");
                }
 
-               synchronized (getLock()) {
+               synchronized (lock) {
                        this.min = min;
                        this.max = max;
                }
@@ -226,7 +225,7 @@ public class Progress {
         *            the progress to set
         */
        public void setProgress(int progress) {
-               synchronized (getLock()) {
+               synchronized (lock) {
                        double childrenProgress = relativeProgress - relativeLocalProgress;
 
                        relativeLocalProgress = ((double) progress) / (max - min);
@@ -261,7 +260,7 @@ public class Progress {
         */
        private void setRelativeProgress(Progress pg, String name,
                        double relativeProgress) {
-               synchronized (getLock()) {
+               synchronized (lock) {
                        relativeProgress = Math.max(0, relativeProgress);
                        relativeProgress = Math.min(1, relativeProgress);
                        this.relativeProgress = relativeProgress;
@@ -287,7 +286,7 @@ public class Progress {
         *            the amount to add
         */
        public void add(int step) {
-               synchronized (getLock()) {
+               synchronized (lock) {
                        setProgress(getLocalProgress() + step);
                }
        }
@@ -306,7 +305,7 @@ public class Progress {
         * Mark the {@link Progress} as done by setting its value to max.
         */
        public void done() {
-               synchronized (getLock()) {
+               synchronized (lock) {
                        double childrenProgress = relativeProgress - relativeLocalProgress;
                        relativeLocalProgress = 1 - childrenProgress;
                        setRelativeProgress(this, name, 1d);
@@ -318,15 +317,18 @@ public class Progress {
         * 
         * @return the children (Who will think of the children??)
         */
-       public Set<Progress> getChildren() {
-               return children.keySet();
+       public List<Progress> getChildren() {
+               synchronized (lock) {
+                       return new ArrayList<Progress>(children.keySet());
+               }
        }
 
        /**
         * Notify the listeners that this {@link Progress} changed value.
         * 
         * @param pg
-        *            the emmiter
+        *            the emmiter, that is, the (sub-){link Progress} that just
+        *            reported some change, not always the same as <tt>this</tt>
         * @param name
         *            the current name (if it is NULL, the first non-null name in
         *            the hierarchy will overwrite it) of the {@link Progress} who
@@ -341,7 +343,7 @@ public class Progress {
                        name = this.name;
                }
 
-               synchronized (getLock()) {
+               synchronized (lock) {
                        for (ProgressListener l : listeners) {
                                l.progress(pg, name);
                        }
@@ -359,7 +361,9 @@ public class Progress {
         *            the listener
         */
        public void addProgressListener(ProgressListener l) {
-               this.listeners.add(l);
+               synchronized (lock) {
+                       this.listeners.add(l);
+               }
        }
 
        /**
@@ -371,7 +375,9 @@ public class Progress {
         * @return TRUE if it was found (and removed)
         */
        public boolean removeProgressListener(ProgressListener l) {
-               return this.listeners.remove(l);
+               synchronized (lock) {
+                       return this.listeners.remove(l);
+               }
        }
 
        /**
@@ -392,7 +398,7 @@ public class Progress {
                if (weight < min || weight > max) {
                        throw new RuntimeException(String.format(
                                        "Progress object %s cannot have a weight of %f, "
-                                                       + "it is outside of its parent (%s) range (%f)",
+                                                       + "it is outside of its parent (%s) range (%d)",
                                        progress.name, weight, name, max));
                }
 
@@ -403,10 +409,10 @@ public class Progress {
                                        name, progress.parent.name));
                }
 
-               progress.addProgressListener(new ProgressListener() {
+               ProgressListener progressListener = new ProgressListener() {
                        @Override
                        public void progress(Progress pg, String name) {
-                               synchronized (getLock()) {
+                               synchronized (lock) {
                                        double total = relativeLocalProgress;
                                        for (Entry<Progress, Double> entry : children.entrySet()) {
                                                total += (entry.getValue() / (max - min))
@@ -416,23 +422,12 @@ public class Progress {
                                        setRelativeProgress(pg, name, total);
                                }
                        }
-               });
-
-               this.children.put(progress, weight);
-       }
+               };
 
-       /**
-        * The lock object to use (this one or the recursively-parent one).
-        * 
-        * @return the lock object to use
-        */
-       private Object getLock() {
                synchronized (lock) {
-                       if (parent != null) {
-                               return parent.getLock();
-                       }
-
-                       return lock;
+                       progress.parent = this;
+                       this.children.put(progress, weight);
+                       progress.addProgressListener(progressListener);
                }
        }
 }