git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '77d3a60869e7a780c6ae069e51530e1eacece5e2'
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
Progress.java
diff --git
a/src/be/nikiroo/utils/Progress.java
b/src/be/nikiroo/utils/Progress.java
index 6f05110e8715305b438258b45cf1674b992a4451..dea6be3fa011c351e4990b39e396368a50174e9d 100644
(file)
--- a/
src/be/nikiroo/utils/Progress.java
+++ b/
src/be/nikiroo/utils/Progress.java
@@
-138,7
+138,7
@@
public class Progress {
throw new RuntimeException("negative values not supported");
}
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 (min > max) {
throw new RuntimeException(
"The minimum progress value must be <= the maximum progress value");
@@
-168,7
+168,7
@@
public class Progress {
* if max < min
*/
public void setMax(int max) {
* 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");
if (max < min) {
throw new Error(
"The maximum progress value must be >= the minimum progress value");
@@
-199,7
+199,7
@@
public class Progress {
"The minimum progress value must be <= the maximum progress value");
}
"The minimum progress value must be <= the maximum progress value");
}
- synchronized (
getLock()
) {
+ synchronized (
lock
) {
this.min = min;
this.max = max;
}
this.min = min;
this.max = max;
}
@@
-225,7
+225,7
@@
public class Progress {
* the progress to set
*/
public void setProgress(int progress) {
* the progress to set
*/
public void setProgress(int progress) {
- synchronized (
getLock()
) {
+ synchronized (
lock
) {
double childrenProgress = relativeProgress - relativeLocalProgress;
relativeLocalProgress = ((double) progress) / (max - min);
double childrenProgress = relativeProgress - relativeLocalProgress;
relativeLocalProgress = ((double) progress) / (max - min);
@@
-260,7
+260,7
@@
public class Progress {
*/
private void setRelativeProgress(Progress pg, String name,
double relativeProgress) {
*/
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;
relativeProgress = Math.max(0, relativeProgress);
relativeProgress = Math.min(1, relativeProgress);
this.relativeProgress = relativeProgress;
@@
-286,7
+286,7
@@
public class Progress {
* the amount to add
*/
public void add(int step) {
* the amount to add
*/
public void add(int step) {
- synchronized (
getLock()
) {
+ synchronized (
lock
) {
setProgress(getLocalProgress() + step);
}
}
setProgress(getLocalProgress() + step);
}
}
@@
-305,7
+305,7
@@
public class Progress {
* Mark the {@link Progress} as done by setting its value to max.
*/
public void done() {
* 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);
double childrenProgress = relativeProgress - relativeLocalProgress;
relativeLocalProgress = 1 - childrenProgress;
setRelativeProgress(this, name, 1d);
@@
-318,7
+318,7
@@
public class Progress {
* @return the children (Who will think of the children??)
*/
public List<Progress> getChildren() {
* @return the children (Who will think of the children??)
*/
public List<Progress> getChildren() {
- synchronized (
getLock()
) {
+ synchronized (
lock
) {
return new ArrayList<Progress>(children.keySet());
}
}
return new ArrayList<Progress>(children.keySet());
}
}
@@
-327,7
+327,8
@@
public class Progress {
* Notify the listeners that this {@link Progress} changed value.
*
* @param pg
* 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
* @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
@@
-342,7
+343,7
@@
public class Progress {
name = this.name;
}
name = this.name;
}
- synchronized (
getLock()
) {
+ synchronized (
lock
) {
for (ProgressListener l : listeners) {
l.progress(pg, name);
}
for (ProgressListener l : listeners) {
l.progress(pg, name);
}
@@
-360,7
+361,7
@@
public class Progress {
* the listener
*/
public void addProgressListener(ProgressListener l) {
* the listener
*/
public void addProgressListener(ProgressListener l) {
- synchronized (
getLock()
) {
+ synchronized (
lock
) {
this.listeners.add(l);
}
}
this.listeners.add(l);
}
}
@@
-374,7
+375,7
@@
public class Progress {
* @return TRUE if it was found (and removed)
*/
public boolean removeProgressListener(ProgressListener l) {
* @return TRUE if it was found (and removed)
*/
public boolean removeProgressListener(ProgressListener l) {
- synchronized (
getLock()
) {
+ synchronized (
lock
) {
return this.listeners.remove(l);
}
}
return this.listeners.remove(l);
}
}
@@
-397,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, "
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));
}
progress.name, weight, name, max));
}
@@
-408,41
+409,25
@@
public class Progress {
name, progress.parent.name));
}
name, progress.parent.name));
}
-
progress.addProgressListener(
new ProgressListener() {
+
ProgressListener progressListener =
new ProgressListener() {
@Override
public void progress(Progress pg, String name) {
@Override
public void progress(Progress pg, String name) {
- synchronized (
getLock()
) {
+ synchronized (
lock
) {
double total = relativeLocalProgress;
double total = relativeLocalProgress;
- synchronized (getLock()) {
- for (Entry<Progress, Double> entry : children
- .entrySet()) {
- total += (entry.getValue() / (max - min))
- * entry.getKey().getRelativeProgress();
- }
+ for (Entry<Progress, Double> entry : children.entrySet()) {
+ total += (entry.getValue() / (max - min))
+ * entry.getKey().getRelativeProgress();
}
setRelativeProgress(pg, name, total);
}
}
}
setRelativeProgress(pg, name, total);
}
}
- }
)
;
+ };
- synchronized (getLock()) {
- 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) {
synchronized (lock) {
- if (parent != null) {
- return parent.getLock();
- }
-
- return lock;
+ progress.parent = this;
+ this.children.put(progress, weight);
+ progress.addProgressListener(progressListener);
}
}
}
}
}
}