import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Set;
/**
* Progress reporting system, possibly nested.
+ * <p>
+ * A {@link Progress} can have a name, and that name will be reported through
+ * the event system (it will report the first non-null name in the stack from
+ * the {@link Progress} from which the event originated to the parent the event
+ * is listened on).
+ * <p>
+ * The {@link Progress} also has a table of keys/values shared amongst all the
+ * hierarchy (note that when adding a {@link Progress} to others, its values
+ * will be prioritized if some with the same keys were already present in the
+ * hierarchy).
*
* @author niki
*/
public void progress(Progress progress, String name);
}
+ private Map<Object, Object> map = new HashMap<Object, Object>();
private Progress parent = null;
private Object lock = new Object();
private String name;
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");
* if max < 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");
"The minimum progress value must be <= the maximum progress value");
}
- synchronized (getLock()) {
+ synchronized (lock) {
this.min = min;
this.max = max;
}
* the progress to set
*/
public void setProgress(int progress) {
- synchronized (getLock()) {
+ synchronized (lock) {
double childrenProgress = relativeProgress - relativeLocalProgress;
relativeLocalProgress = ((double) progress) / (max - min);
*/
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;
* the amount to add
*/
public void add(int step) {
- synchronized (getLock()) {
+ synchronized (lock) {
setProgress(getLocalProgress() + step);
}
}
* 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);
*
* @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
name = this.name;
}
- synchronized (getLock()) {
+ synchronized (lock) {
for (ProgressListener l : listeners) {
l.progress(pg, name);
}
* the listener
*/
public void addProgressListener(ProgressListener l) {
- this.listeners.add(l);
+ synchronized (lock) {
+ this.listeners.add(l);
+ }
}
/**
* @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);
+ }
}
/**
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));
}
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))
setRelativeProgress(pg, name, total);
}
}
- });
+ };
- this.children.put(progress, weight);
+ synchronized (lock) {
+ // Should not happen but just in case
+ if (this.map != progress.map) {
+ this.map.putAll(progress.map);
+ }
+ progress.map = this.map;
+ progress.parent = this;
+ this.children.put(progress, weight);
+ progress.addProgressListener(progressListener);
+ }
}
/**
- * The lock object to use (this one or the recursively-parent one).
+ * Set the given value for the given key on this {@link Progress} and it's
+ * children.
*
- * @return the lock object to use
+ * @param key
+ * the key
+ * @param value
+ * the value
*/
- private Object getLock() {
- synchronized (lock) {
- if (parent != null) {
- return parent.getLock();
- }
+ public void put(Object key, Object value) {
+ map.put(key, value);
+ }
- return lock;
+ /**
+ * Return the value associated with this key as a {@link String} if any,
+ * NULL if not.
+ * <p>
+ * If the value is not NULL but not a {@link String}, it will be converted
+ * via {@link Object#toString()}.
+ *
+ * @param key
+ * the key to check
+ *
+ * @return the value or NULL
+ */
+ public String getString(Object key) {
+ Object value = map.get(key);
+ if (value == null) {
+ return null;
}
+
+ return value.toString();
+ }
+
+ /**
+ * Return the value associated with this key if any, NULL if not.
+ *
+ * @param key
+ * the key to check
+ *
+ * @return the value or NULL
+ */
+ public Object get(Object key) {
+ return map.get(key);
}
}
git://git.nikiroo.be / fanfix.git / blobdiff