summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-10-27 17:53:22 (EDT)
committerEike Stepper2006-10-27 17:53:22 (EDT)
commit1b1109017d317774d076718344291828938034cc (patch)
treeafe0568dafb6bf9880c39744ac2be46fc2767805
parent973147137a23cfb368e0d387b9513fdae4ef46b4 (diff)
downloadcdo-1b1109017d317774d076718344291828938034cc.zip
cdo-1b1109017d317774d076718344291828938034cc.tar.gz
cdo-1b1109017d317774d076718344291828938034cc.tar.bz2
Minor fixes
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java5
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java6
3 files changed, 13 insertions, 2 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
index 951bff6..10ee350 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java
@@ -13,6 +13,7 @@ package org.eclipse.net4j.signal;
import org.eclipse.net4j.transport.BufferHandler;
import org.eclipse.net4j.transport.Channel;
import org.eclipse.net4j.transport.util.BufferInputStream;
+import org.eclipse.net4j.util.ReflectUtil;
/**
* @author Eike Stepper
@@ -52,7 +53,8 @@ public abstract class SignalActor<RESULT> extends Signal
@Override
public String toString()
{
- return "SignalActor[" + getSignalID() + ", " + getProtocol() + ", correlation=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return ReflectUtil.getSimpleName(getClass())
+ + "[" + getSignalID() + ", " + getProtocol() + ", correlation=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getCorrelationID() + (terminated ? ", SENT" : "") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
index 55d43b7..ee2b28e 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java
@@ -10,6 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.signal;
+import org.eclipse.net4j.util.ReflectUtil;
+
/**
* @author Eike Stepper
*/
@@ -22,7 +24,8 @@ public abstract class SignalReactor extends Signal
@Override
public String toString()
{
- return "SignalReactor[" + getSignalID() + ", " + getProtocol() + ", correlation=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return ReflectUtil.getSimpleName(getClass())
+ + "[" + getSignalID() + ", " + getProtocol() + ", correlation=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getCorrelationID() + "]"; //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java
index aa3e7ee..c603b4f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java
@@ -14,6 +14,8 @@ import org.eclipse.net4j.util.registry.HashMapRegistry;
import org.eclipse.net4j.util.registry.IRegistry;
import org.eclipse.net4j.util.registry.IRegistryElement;
+import java.util.concurrent.ExecutorService;
+
/**
* One endpoint of a physical connection of arbitrary nature between two
* communicating parties. A {@link Connector} encapsulates the process of
@@ -117,6 +119,10 @@ public interface Connector extends IRegistryElement<Integer>
*/
public void setProtocolFactoryRegistry(IRegistry<String, ProtocolFactory> protocolFactoryRegistry);
+ public ExecutorService getReceiveExecutor();
+
+ public void setReceiveExecutor(ExecutorService receiveExecutor);
+
public void addStateListener(StateListener listener);
public void removeStateListener(StateListener listener);