[251751] Provide progress monitoring for commit operations

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

3 files changed, 5 insertions, 7 deletions

diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptor.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptor.java
index fa7eea43dc..b8b8b6e0f0 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptor.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPAcceptor.java
@@ -23,8 +23,7 @@ import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 import org.eclipse.net4j.util.om.trace.ContextTracer;
 import org.eclipse.net4j.util.security.IRandomizer;
 
-import org.eclipse.internal.net4j.acceptor.Acceptor;
-
+import org.eclipse.spi.net4j.Acceptor;
 import org.eclipse.spi.net4j.InternalConnector;
 
 import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPServerConnector.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPServerConnector.java
index d88028108d..8480260996 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPServerConnector.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/HTTPServerConnector.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.http.internal.server;
 
-import org.eclipse.net4j.connector.ConnectorException;
+import org.eclipse.net4j.channel.ChannelException;
 import org.eclipse.net4j.http.internal.common.HTTPConnector;
 import org.eclipse.net4j.protocol.IProtocol;
 
@@ -67,8 +67,7 @@ public class HTTPServerConnector extends HTTPConnector
   }
 
   @Override
-  protected void registerChannelWithPeer(short channelIndex, long timeout, IProtocol<?> protocol)
-      throws ConnectorException
+  protected void registerChannelWithPeer(short channelID, long timeout, IProtocol<?> protocol) throws ChannelException
   {
     throw new UnsupportedOperationException();
   }
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
index 3ed588c979..4eb77b4202 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
@@ -149,7 +149,7 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
       for (IChannel channel : connector.getChannels())
       {
         writer.write("    ");
-        writer.write(String.valueOf(channel.getIndex()));
+        writer.write(String.valueOf(channel.getID()));
         writer.write(": ");
         IBufferHandler receiveHandler = channel.getReceiveHandler();
         if (receiveHandler instanceof IProtocol)
@@ -168,7 +168,7 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
         }
 
         writer.write(" (");
-        writer.write(String.valueOf(channel.getIndex()));
+        writer.write(String.valueOf(channel.getID()));
         writer.write(")\n");
       }
     }