[258067] Provide RequestWithMonitoring example

https://bugs.eclipse.org/bugs/show_bug.cgi?id=258067

18 files changed, 235 insertions, 74 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java
index 1ee8fc9f22..451559523c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java
@@ -41,7 +41,7 @@ public class CDOClientProtocol extends CDOProtocolImpl implements CDOSessionProt
       return new CommitNotificationIndication(this);
 
     default:
-      return null;
+      return super.createSignalReactor(signalID);
     }
   }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java
index 42d85c9f24..dd2629cad2 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CDOPackageTypeRegistryImpl.java
@@ -198,8 +198,8 @@ public final class CDOPackageTypeRegistryImpl extends HashMapRegistry<String, CD
 
   private IFilter createExtensionPointFilter()
   {
-    final IExtensionPoint xpt = Platform.getExtensionRegistry().getExtensionPoint(
-        EcorePlugin.getPlugin().getBundle().getSymbolicName(), EcorePlugin.GENERATED_PACKAGE_PPID);
+    final IExtensionPoint xpt = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.emf.ecore",
+        EcorePlugin.GENERATED_PACKAGE_PPID);
     return new IFilter()
     {
       public boolean matches(IExtensionPoint target)
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
index 00884493eb..5351558c12 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddiesServerProtocol.java
@@ -26,11 +26,7 @@ public class BuddiesServerProtocol extends SignalProtocol<ServerSession>
 {
   public BuddiesServerProtocol()
   {
-  }
-
-  public String getType()
-  {
-    return ProtocolConstants.PROTOCOL_NAME;
+    super(ProtocolConstants.PROTOCOL_NAME);
   }
 
   @Override
@@ -63,7 +59,7 @@ public class BuddiesServerProtocol extends SignalProtocol<ServerSession>
       return new MessageIndication(this, IBuddyAdmin.INSTANCE);
 
     default:
-      return null;
+      return super.createSignalReactor(signalID);
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
index b30ecddf52..7967cf1a0c 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
@@ -31,14 +31,10 @@ public class BuddiesClientProtocol extends SignalProtocol<ClientSession>
 
   public BuddiesClientProtocol(IConnector connector)
   {
+    super(ProtocolConstants.PROTOCOL_NAME);
     open(connector);
   }
 
-  public String getType()
-  {
-    return ProtocolConstants.PROTOCOL_NAME;
-  }
-
   @Override
   protected SignalReactor createSignalReactor(short signalID)
   {
@@ -66,7 +62,7 @@ public class BuddiesClientProtocol extends SignalProtocol<ClientSession>
       return new MessageIndication(this, getSelf());
 
     default:
-      return null;
+      return super.createSignalReactor(signalID);
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
index 827fa5d2b4..575920e24a 100644
--- a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
+ org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
  org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.jvm;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples/build.properties b/plugins/org.eclipse.net4j.examples/build.properties
index 1ec3548179..b6630fc1e7 100644
--- a/plugins/org.eclipse.net4j.examples/build.properties
+++ b/plugins/org.eclipse.net4j.examples/build.properties
@@ -23,4 +23,5 @@ bin.includes = META-INF/,\
                about.mappings,\
                about.properties,\
                modeling32.png,\
-               plugin.xml
+               plugin.xml,\
+               icons/
diff --git a/plugins/org.eclipse.net4j.examples/icons/sample.gif b/plugins/org.eclipse.net4j.examples/icons/sample.gif
new file mode 100644
index 0000000000..34fb3c9d8c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.examples/icons/sample.gif
diff --git a/plugins/org.eclipse.net4j.examples/plugin.xml b/plugins/org.eclipse.net4j.examples/plugin.xml
index 90489e992e..6682a4bbb9 100644
--- a/plugins/org.eclipse.net4j.examples/plugin.xml
+++ b/plugins/org.eclipse.net4j.examples/plugin.xml
@@ -7,6 +7,35 @@
             class="org.eclipse.net4j.examples.echo.server.EchoServerProtocol$Factory"
             productGroup="org.eclipse.net4j.serverProtocols"
             type="echo"/>
+      <factory
+            class="org.eclipse.net4j.examples.transfer.UploadServer$ProtocolFactory"
+            productGroup="org.eclipse.net4j.serverProtocols"
+            type="upload"/>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.actionSets">
+      <actionSet
+            id="org.eclipse.net4j.examples.actionSet"
+            label="Net4j Examples"
+            visible="true">
+         <menu
+               id="sampleMenu"
+               label="Net4j Examples">
+            <separator
+                  name="sampleGroup">
+            </separator>
+         </menu>
+         <action
+               class="org.eclipse.net4j.examples.transfer.UploadClientAction"
+               icon="icons/sample.gif"
+               id="org.eclipse.net4j.examples.transfer.TransferClientAction"
+               label="Upload File"
+               menubarPath="sampleMenu/sampleGroup"
+               toolbarPath="sampleGroup"
+               tooltip="Upload file to Net4j server">
+         </action>
+      </actionSet>
    </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
index df40d959d6..375c42a4b3 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
@@ -13,7 +13,6 @@ package org.eclipse.net4j.examples.echo.client;
 import org.eclipse.net4j.connector.IConnector;
 import org.eclipse.net4j.examples.echo.EchoProtocol;
 import org.eclipse.net4j.signal.SignalProtocol;
-import org.eclipse.net4j.signal.SignalReactor;
 
 /**
  * @author Eike Stepper
@@ -23,18 +22,7 @@ public class EchoClientProtocol extends SignalProtocol<Object> implements EchoPr
 {
   public EchoClientProtocol(IConnector connector)
   {
+    super(PROTOCOL_NAME);
     open(connector);
   }
-
-  public String getType()
-  {
-    return PROTOCOL_NAME;
-  }
-
-  @Override
-  protected SignalReactor createSignalReactor(short signalID)
-  {
-    // On client side only needed for server initiated requests
-    return null;
-  }
 }
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
index 54e468761b..3b45240c3f 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
@@ -25,11 +25,7 @@ public class EchoServerProtocol extends SignalProtocol<Object> implements EchoPr
 {
   public EchoServerProtocol()
   {
-  }
-
-  public String getType()
-  {
-    return PROTOCOL_NAME;
+    super(PROTOCOL_NAME);
   }
 
   @Override
@@ -41,7 +37,7 @@ public class EchoServerProtocol extends SignalProtocol<Object> implements EchoPr
       return new EchoIndication(this);
 
     default:
-      return null;
+      return super.createSignalReactor(signalID);
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadClientAction.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadClientAction.java
new file mode 100644
index 0000000000..79f448cd68
--- /dev/null
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadClientAction.java
@@ -0,0 +1,168 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http:www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.examples.transfer;
+
+import org.eclipse.net4j.connector.IConnector;
+import org.eclipse.net4j.internal.examples.bundle.OM;
+import org.eclipse.net4j.signal.RequestWithMonitoring;
+import org.eclipse.net4j.signal.SignalProtocol;
+import org.eclipse.net4j.util.container.IPluginContainer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.om.monitor.EclipseMonitor;
+import org.eclipse.net4j.util.om.monitor.OMMonitor;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+
+public class UploadClientAction implements IWorkbenchWindowActionDelegate, UploadProtocol
+{
+  private IWorkbenchWindow window;
+
+  public UploadClientAction()
+  {
+  }
+
+  public void init(IWorkbenchWindow window)
+  {
+    this.window = window;
+  }
+
+  public void run(IAction action)
+  {
+    FileDialog fileDialog = new FileDialog(window.getShell());
+    final String path = fileDialog.open();
+    if (path != null)
+    {
+      final File file = new File(path);
+      new Job("Uploading file")
+      {
+        @Override
+        protected IStatus run(IProgressMonitor monitor)
+        {
+          try
+          {
+            boolean replaced = transferFile(file, monitor);
+            OM.LOG.info("File " + path + (replaced ? " replaced" : " stored") + " on the Net4j server.");
+            return Status.OK_STATUS;
+          }
+          catch (Exception ex)
+          {
+            return new Status(IStatus.ERROR, OM.BUNDLE_ID, "Problem with upload of " + path, ex);
+          }
+          finally
+          {
+            monitor.done();
+          }
+        }
+      }.schedule();
+    }
+  }
+
+  public void selectionChanged(IAction action, ISelection selection)
+  {
+  }
+
+  public void dispose()
+  {
+  }
+
+  private boolean transferFile(final File file, IProgressMonitor monitor) throws Exception
+  {
+    SignalProtocol<Object> protocol = null;
+
+    try
+    {
+      // Start a connector that represents the client side of a physical connection
+      IConnector connector = (IConnector)IPluginContainer.INSTANCE.getElement("org.eclipse.net4j.connectors", "tcp",
+          "localhost:2036");
+
+      // Open a virtual channel with the ECHO protocol, send an ECHO request and close the channel
+      protocol = new SignalProtocol<Object>(PROTOCOL_NAME);
+      protocol.open(connector);
+
+      UploadRequest request = new UploadRequest(protocol, file);
+      EclipseMonitor e = new EclipseMonitor(monitor);
+      return request.send(e);
+    }
+    finally
+    {
+      protocol.close();
+    }
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  public static final class UploadRequest extends RequestWithMonitoring<Boolean>
+  {
+    private File file;
+
+    public UploadRequest(SignalProtocol<?> protocol, File file)
+    {
+      super(protocol, UPLOAD_SIGNAL_ID);
+      this.file = file;
+    }
+
+    @Override
+    protected void requesting(ExtendedDataOutputStream out, OMMonitor monitor) throws Exception
+    {
+      long size = file.length();
+      out.writeLong(size);
+      out.writeString(file.getName());
+
+      monitor.begin((int)size);
+      BufferedInputStream in = null;
+
+      try
+      {
+        in = new BufferedInputStream(new FileInputStream(file));
+        while (size != 0L)
+        {
+          int chunk = BUFFER_SIZE;
+          if (size < BUFFER_SIZE)
+          {
+            chunk = (int)size;
+          }
+
+          byte[] buffer = new byte[chunk];
+          in.read(buffer);
+          out.writeByteArray(buffer);
+
+          monitor.worked(chunk);
+          size -= chunk;
+        }
+      }
+      finally
+      {
+        monitor.done();
+        in.close();
+      }
+    }
+
+    @Override
+    protected Boolean confirming(ExtendedDataInputStream in, OMMonitor monitor) throws Exception
+    {
+      return in.readBoolean();
+    }
+  }
+}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
index a70af82676..ed16eba32b 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
@@ -22,11 +22,7 @@ public class JMSServerProtocol extends SignalProtocol<ServerConnection>
 {
   public JMSServerProtocol()
   {
-  }
-
-  public String getType()
-  {
-    return JMSProtocolConstants.PROTOCOL_NAME;
+    super(JMSProtocolConstants.PROTOCOL_NAME);
   }
 
   @Override
@@ -62,7 +58,7 @@ public class JMSServerProtocol extends SignalProtocol<ServerConnection>
       return new JMSRollbackIndication(this);
 
     default:
-      return null;
+      return super.createSignalReactor(signalID);
     }
   }
 }
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
index 77133205f8..5e38e8ef3f 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
@@ -22,11 +22,7 @@ public class JMSAdminServerProtocol extends SignalProtocol<Object>
 {
   public JMSAdminServerProtocol()
   {
-  }
-
-  public String getType()
-  {
-    return JMSAdminProtocolConstants.PROTOCOL_NAME;
+    super(JMSAdminProtocolConstants.PROTOCOL_NAME);
   }
 
   @Override
@@ -38,7 +34,7 @@ public class JMSAdminServerProtocol extends SignalProtocol<Object>
       return new JMSCreateDestinationIndication(this);
 
     default:
-      return null;
+      return super.createSignalReactor(signalID);
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java
index fa55acf4fe..e9af20aba6 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java
@@ -18,8 +18,8 @@ import org.eclipse.net4j.util.container.IManagedContainer;
 import org.eclipse.net4j.util.factory.ProductCreationException;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
-import org.eclipse.net4j.util.om.monitor.OMMonitor;
 import org.eclipse.net4j.util.om.monitor.Monitor;
+import org.eclipse.net4j.util.om.monitor.OMMonitor;
 
 import org.eclipse.spi.net4j.ServerProtocolFactory;
 
@@ -40,13 +40,8 @@ public class SignalMonitorTest extends AbstractTransportTest
     {
       public Object create(String description) throws ProductCreationException
       {
-        return new SignalProtocol<Object>()
+        return new SignalProtocol<Object>(PROTOCOL_TYPE)
         {
-          public String getType()
-          {
-            return PROTOCOL_TYPE;
-          }
-
           @Override
           protected SignalReactor createSignalReactor(short signalID)
           {
@@ -100,7 +95,7 @@ public class SignalMonitorTest extends AbstractTransportTest
               };
 
             default:
-              return null;
+              return super.createSignalReactor(signalID);
             }
           }
         };
@@ -162,15 +157,9 @@ public class SignalMonitorTest extends AbstractTransportTest
    */
   public static final class ClientProtocol extends SignalProtocol<Object>
   {
-    public String getType()
-    {
-      return PROTOCOL_TYPE;
-    }
-
-    @Override
-    protected SignalReactor createSignalReactor(short signalID)
+    public ClientProtocol()
     {
-      return null;
+      super(PROTOCOL_TYPE);
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java
index 50bfa70090..c5b06dad73 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java
@@ -24,14 +24,10 @@ public final class TestProtocol extends Protocol<CountDownLatch>
 {
   public TestProtocol(CountDownLatch counter)
   {
+    super(ServerTestProtocolFactory.TYPE);
     setInfraStructure(counter);
   }
 
-  public String getType()
-  {
-    return ServerTestProtocolFactory.TYPE;
-  }
-
   public void handleBuffer(IBuffer buffer)
   {
     IOUtil.OUT().println("BUFFER ARRIVED");
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java
index 708f6d96b7..897ce9dfcb 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java
@@ -44,11 +44,13 @@ public class TestSignalProtocol extends SignalProtocol<Object>
 
   public TestSignalProtocol(IConnector connector)
   {
+    this();
     open(connector);
   }
 
   public TestSignalProtocol(IFailOverStrategy failOverStrategy)
   {
+    this();
     open(failOverStrategy);
   }
 
@@ -57,11 +59,7 @@ public class TestSignalProtocol extends SignalProtocol<Object>
    */
   private TestSignalProtocol()
   {
-  }
-
-  public String getType()
-  {
-    return PROTOCOL_NAME;
+    super(PROTOCOL_NAME);
   }
 
   @Override
@@ -88,7 +86,7 @@ public class TestSignalProtocol extends SignalProtocol<Object>
       return new ExceptionIndication(this);
 
     default:
-      return null;
+      return super.createSignalReactor(signalID);
     }
   }
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/EclipseMonitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/EclipseMonitor.java
index ef63dd5480..6335750981 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/EclipseMonitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/EclipseMonitor.java
@@ -64,4 +64,11 @@ public class EclipseMonitor extends Monitor
     super.worked(work);
     progressMonitor.worked(work);
   }
+
+  @Override
+  public synchronized void done()
+  {
+    super.done();
+    progressMonitor.done();
+  }
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/Monitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/Monitor.java
index dafb240ed4..3a534f2bc2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/Monitor.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/monitor/Monitor.java
@@ -41,21 +41,25 @@ public class Monitor implements OMMonitor
 
   public synchronized void begin(int totalWork) throws MonitorCanceledException
   {
+    checkCanceled();
     this.totalWork = totalWork;
   }
 
   public synchronized void worked(int work) throws MonitorCanceledException
   {
+    checkCanceled();
     this.work += work;
   }
 
   public synchronized OMMonitor fork(int work)
   {
+    checkCanceled();
     return new NestedMonitor(this, work);
   }
 
   public synchronized void done()
   {
+    checkCanceled();
     int rest = totalWork - work;
     if (rest > 0)
     {