X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fui%2FProgressBar.java;h=11e1e6c05356638266a105762a1cf569f8797f36;hb=601003e69e1dc81774243c6eadf7982b6b563b33;hp=6e1e7cef151c5fd561c953a58bf3bf7565667e1e;hpb=88b36f83bb4bb9201339432c97e6d826aa9e1903;p=fanfix.git

diff --git a/src/be/nikiroo/utils/ui/ProgressBar.java b/src/be/nikiroo/utils/ui/ProgressBar.java
index 6e1e7ce..11e1e6c 100644
--- a/src/be/nikiroo/utils/ui/ProgressBar.java
+++ b/src/be/nikiroo/utils/ui/ProgressBar.java
@@ -14,112 +14,175 @@ import javax.swing.SwingUtilities;
 
 import be.nikiroo.utils.Progress;
 
+/**
+ * A graphical control to show the progress of a {@link Progress}.
+ * <p>
+ * This control is <b>NOT</b> thread-safe.
+ * 
+ * @author niki
+ */
 public class ProgressBar extends JPanel {
 	private static final long serialVersionUID = 1L;
 
 	private Map<Progress, JProgressBar> bars;
-	private List<ActionListener> listeners;
+	private List<ActionListener> actionListeners;
+	private List<ActionListener> updateListeners;
 	private Progress pg;
+	private Object lock = new Object();
 
 	public ProgressBar() {
 		bars = new HashMap<Progress, JProgressBar>();
-		listeners = new ArrayList<ActionListener>();
+		actionListeners = new ArrayList<ActionListener>();
+		updateListeners = new ArrayList<ActionListener>();
+	}
+	
+	public ProgressBar(Progress pg) {
+		this();
+		setProgress(pg);
 	}
 
 	public void setProgress(final Progress pg) {
 		this.pg = pg;
 
-		if (pg == null) {
-			setPresent(false);
-		} else {
-			final JProgressBar bar = new JProgressBar();
-			bar.setStringPainted(true);
-
-			bars.clear();
-			bars.put(pg, bar);
-
-			bar.setMinimum(pg.getMin());
-			bar.setMaximum(pg.getMax());
-			bar.setValue(pg.getProgress());
-			bar.setString(pg.getName());
-
-			pg.addProgressListener(new Progress.ProgressListener() {
-				public void progress(Progress progress, String name) {
-
-					SwingUtilities.invokeLater(new Runnable() {
-						public void run() {
-							Map<Progress, JProgressBar> newBars = new HashMap<Progress, JProgressBar>();
-							newBars.put(pg, bar);
-
-							bar.setMinimum(pg.getMin());
-							bar.setMaximum(pg.getMax());
-							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);
-								}
-
-								newBars.put(pg, bar);
-
-								bar.setMinimum(pg.getMin());
-								bar.setMaximum(pg.getMax());
-								bar.setValue(pg.getProgress());
-								bar.setString(pg.getName());
-							}
-
-							bars = newBars;
-
-							if (pg.isDone()) {
-								for (ActionListener listener : listeners) {
-									listener.actionPerformed(new ActionEvent(
-											ProgressBar.this, 0, "done"));
+		SwingUtilities.invokeLater(new Runnable() {
+			@Override
+			public void run() {
+				if (pg != null) {
+					final JProgressBar bar = new JProgressBar();
+					bar.setStringPainted(true);
+
+					bars.clear();
+					bars.put(pg, bar);
+
+					bar.setMinimum(pg.getMin());
+					bar.setMaximum(pg.getMax());
+					bar.setValue(pg.getProgress());
+					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);
+
+									bar.setMinimum(pg.getMin());
+									bar.setMaximum(pg.getMax());
+									bar.setValue(pg.getProgress());
+									bar.setString(pg.getName());
+
+									synchronized (lock) {
+									for (Progress pgChild : getChildrenAsOrderedList(pg)) {
+										JProgressBar barChild = bars
+												.get(pgChild);
+										if (barChild == null) {
+											barChild = new JProgressBar();
+											barChild.setStringPainted(true);
+										}
+
+										newBars.put(pgChild, barChild);
+
+										barChild.setMinimum(pgChild.getMin());
+										barChild.setMaximum(pgChild.getMax());
+										barChild.setValue(pgChild.getProgress());
+										barChild.setString(pgChild.getName());
+									}
+									
+									if (ProgressBar.this.pg == null) {
+										bars.clear();
+									} else {
+										bars = newBars;
+									}
+									}
+									
+									if (ProgressBar.this.pg != null) {
+										if (pg.isDone()) {
+											pg.removeProgressListener(l);
+											for (ActionListener listener : actionListeners) {
+												listener.actionPerformed(new ActionEvent(
+														ProgressBar.this, 0,
+														"done"));
+											}
+										}
+
+										update();
+									}
 								}
-							}
-
-							setPresent(true);
+							});
 						}
 					});
 				}
-			});
 
-			setPresent(true);
-		}
+				update();
+			}
+		});
 	}
 
-	public void addActioListener(ActionListener l) {
-		listeners.add(l);
+	public void addActionListener(ActionListener l) {
+		actionListeners.add(l);
 	}
 
 	public void clearActionListeners() {
-		listeners.clear();
+		actionListeners.clear();
+	}
+
+	public void addUpdateListener(ActionListener l) {
+		updateListeners.add(l);
+	}
+
+	public void clearUpdateListeners() {
+		updateListeners.clear();
 	}
 
+	public int getProgress() {
+		if (pg == null) {
+			return 0;
+		}
+
+		return pg.getProgress();
+	}
+
+	// only named ones
 	private List<Progress> getChildrenAsOrderedList(Progress pg) {
 		List<Progress> children = new ArrayList<Progress>();
-		for (Progress child : pg.getChildren()) {
-			children.add(child);
+		
+		synchronized (lock) {
+			for (Progress child : pg.getChildren()) {
+			if (child.getName() != null && !child.getName().isEmpty()) {
+				children.add(child);
+			}
 			children.addAll(getChildrenAsOrderedList(child));
 		}
-
+		}
+		
 		return children;
 	}
 
-	private void setPresent(boolean present) {
-		removeAll();
-
-		if (present) {
-			setLayout(new GridLayout(bars.size(), 1));
-			add(bars.get(pg), 0);
-			for (Progress child : getChildrenAsOrderedList(pg)) {
-				add(bars.get(child));
+	private void update() {
+		synchronized (lock) {
+			invalidate();
+			removeAll();
+
+			if (pg != null) {
+				setLayout(new GridLayout(bars.size(), 1));
+				add(bars.get(pg), 0);
+				for (Progress child : getChildrenAsOrderedList(pg)) {
+					JProgressBar jbar = bars.get(child);
+					if (jbar != null) {
+						add(jbar);
+					}
+				}
 			}
+
+			validate();
+			repaint();
 		}
 
-		revalidate();
-		repaint();
+		for (ActionListener listener : updateListeners) {
+			listener.actionPerformed(new ActionEvent(this, 0, "update"));
+		}
 	}
 }