summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-30 08:44:28 (EDT)
committerEike Stepper2007-07-30 08:44:28 (EDT)
commit2335a0d7383e6f7c8fe3359f600276a93ca38fef (patch)
tree69d04bc61c45e82ecb6fe2e8ad54efe1f1e242e1
parentfa955d6fcf0125d5b2046c6a6fce27b45b6d4c80 (diff)
downloadcdo-2335a0d7383e6f7c8fe3359f600276a93ca38fef.zip
cdo-2335a0d7383e6f7c8fe3359f600276a93ca38fef.tar.gz
cdo-2335a0d7383e6f7c8fe3359f600276a93ca38fef.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/MonitorTest.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java12
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/MonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/MonitorTest.java
index 3940701..e3f079e 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/MonitorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/MonitorTest.java
@@ -148,7 +148,7 @@ public class MonitorTest extends AbstractOMTest
*/
private static void readSetting()
{
- OMMonitor monitor = MonitorUtil.begin(1);
+ OMMonitor monitor = MonitorUtil.begin(1, "Reading setting");
// Read setting
monitor.worked("Read setting");
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java
index abbb147..86a26cf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java
@@ -89,8 +89,8 @@ public final class MON
if (current != monitor)
{
throw new IllegalMonitorNestingException("Illegal monitor nesting\n" + //
- "Current monitor stack: " + current.dump() + "\n" + //
- " Used monitor stack: " + monitor.dump() + "\n");
+ "Current monitor stack:\n" + current.dump() + //
+ "Used monitor stack:\n" + monitor.dump());
}
if (!current.hasBegun())
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java
index b657688..4beca30 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java
@@ -134,12 +134,12 @@ public abstract class Monitor implements OMMonitor, OMSubMonitor
public void fork(Runnable runnable, String msg) throws MonitorCanceledException
{
- fork(UNKNOWN, runnable, msg);
+ fork(1, runnable, msg);
}
public void fork(Runnable runnable) throws MonitorCanceledException
{
- fork(UNKNOWN, runnable, null);
+ fork(1, runnable, null);
}
public OMSubMonitor fork(int workFromParent) throws MonitorCanceledException
@@ -154,7 +154,7 @@ public abstract class Monitor implements OMMonitor, OMSubMonitor
public OMSubMonitor fork() throws MonitorCanceledException
{
- return fork(UNKNOWN);
+ return fork(1);
}
public void join(String msg) throws MonitorCanceledException
@@ -262,13 +262,13 @@ public abstract class Monitor implements OMMonitor, OMSubMonitor
protected void dump(StringBuilder builder)
{
+ builder.append(" ");
+ builder.append(task);
+ builder.append("\n");
if (parent != null)
{
parent.dump(builder);
- builder.append(", ");
}
-
- builder.append(task);
}
protected abstract Monitor subMonitor(int workFromParent);