X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FProgress.java;h=6f05110e8715305b438258b45cf1674b992a4451;hb=f4053377fa15da2f11e82955bfab86e673fa371c;hp=d722fc91c3289e9f0b0425cba4bfba87fdc1b88f;hpb=11f9e5f37c2570f0376a4c1898c6aea3a7f28fc7;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/Progress.java b/src/be/nikiroo/utils/Progress.java
index d722fc9..6f05110 100644
--- 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.
@@ -14,6 +13,12 @@ import java.util.Set;
  * @author niki
  */
 public class Progress {
+	/**
+	 * This event listener is designed to report progress events from
+	 * {@link Progress}.
+	 * 
+	 * @author niki
+	 */
 	public interface ProgressListener extends EventListener {
 		/**
 		 * A progression event.
@@ -125,17 +130,17 @@ public class Progress {
 	 *            the min to set
 	 * 
 	 * 
-	 * @throws Error
+	 * @throws RuntimeException
 	 *             if min < 0 or if min > max
 	 */
 	public void setMin(int min) {
 		if (min < 0) {
-			throw new Error("negative values not supported");
+			throw new RuntimeException("negative values not supported");
 		}
 
 		synchronized (getLock()) {
 			if (min > max) {
-				throw new Error(
+				throw new RuntimeException(
 						"The minimum progress value must be <= the maximum progress value");
 			}
 
@@ -159,7 +164,7 @@ public class Progress {
 	 *            the max to set
 	 * 
 	 * 
-	 * @throws Error
+	 * @throws RuntimeException
 	 *             if max &lt; min
 	 */
 	public void setMax(int max) {
@@ -181,16 +186,16 @@ public class Progress {
 	 * @param max
 	 *            the max
 	 * 
-	 * @throws Error
+	 * @throws RuntimeException
 	 *             if min &lt; 0 or if min &gt; max
 	 */
 	public void setMinMax(int min, int max) {
 		if (min < 0) {
-			throw new Error("negative values not supported");
+			throw new RuntimeException("negative values not supported");
 		}
 
 		if (min > max) {
-			throw new Error(
+			throw new RuntimeException(
 					"The minimum progress value must be <= the maximum progress value");
 		}
 
@@ -293,14 +298,18 @@ public class Progress {
 	 * @return TRUE if it is
 	 */
 	public boolean isDone() {
-		return relativeProgress >= 1d;
+		return getProgress() == max;
 	}
 
 	/**
 	 * Mark the {@link Progress} as done by setting its value to max.
 	 */
 	public void done() {
-		setProgress(getMax());
+		synchronized (getLock()) {
+			double childrenProgress = relativeProgress - relativeLocalProgress;
+			relativeLocalProgress = 1 - childrenProgress;
+			setRelativeProgress(this, name, 1d);
+		}
 	}
 
 	/**
@@ -308,8 +317,10 @@ public class Progress {
 	 * 
 	 * @return the children (Who will think of the children??)
 	 */
-	public Set<Progress> getChildren() {
-		return children.keySet();
+	public List<Progress> getChildren() {
+		synchronized (getLock()) {
+			return new ArrayList<Progress>(children.keySet());
+		}
 	}
 
 	/**
@@ -349,7 +360,9 @@ public class Progress {
 	 *            the listener
 	 */
 	public void addProgressListener(ProgressListener l) {
-		this.listeners.add(l);
+		synchronized (getLock()) {
+			this.listeners.add(l);
+		}
 	}
 
 	/**
@@ -361,7 +374,9 @@ public class Progress {
 	 * @return TRUE if it was found (and removed)
 	 */
 	public boolean removeProgressListener(ProgressListener l) {
-		return this.listeners.remove(l);
+		synchronized (getLock()) {
+			return this.listeners.remove(l);
+		}
 	}
 
 	/**
@@ -374,20 +389,20 @@ public class Progress {
 	 *            {@link Progress#getMax()} scale) of this child
 	 *            {@link Progress} in relation to its parent
 	 * 
-	 * @throws Error
+	 * @throws RuntimeException
 	 *             if weight exceed {@link Progress#getMax()} or if progress
 	 *             already has a parent
 	 */
 	public void addProgress(Progress progress, double weight) {
 		if (weight < min || weight > max) {
-			throw new Error(String.format(
+			throw new RuntimeException(String.format(
 					"Progress object %s cannot have a weight of %f, "
 							+ "it is outside of its parent (%s) range (%f)",
 					progress.name, weight, name, max));
 		}
 
 		if (progress.parent != null) {
-			throw new Error(String.format(
+			throw new RuntimeException(String.format(
 					"Progress object %s cannot be added to %s, "
 							+ "as it already has a parent (%s)", progress.name,
 					name, progress.parent.name));
@@ -398,9 +413,12 @@ public class Progress {
 			public void progress(Progress pg, String name) {
 				synchronized (getLock()) {
 					double total = relativeLocalProgress;
-					for (Entry<Progress, Double> entry : children.entrySet()) {
-						total += (entry.getValue() / (max - min))
-								* entry.getKey().getRelativeProgress();
+					synchronized (getLock()) {
+						for (Entry<Progress, Double> entry : children
+								.entrySet()) {
+							total += (entry.getValue() / (max - min))
+									* entry.getKey().getRelativeProgress();
+						}
 					}
 
 					setRelativeProgress(pg, name, total);
@@ -408,7 +426,9 @@ public class Progress {
 			}
 		});
 
-		this.children.put(progress, weight);
+		synchronized (getLock()) {
+			this.children.put(progress, weight);
+		}
 	}
 
 	/**