summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-06-04 00:53:38 (EDT)
committerEike Stepper2008-06-04 00:53:38 (EDT)
commit31b7ae17d1c09b97c6c690eba8abd70fc88f3e90 (patch)
tree85ee4b8e24bab5b97aec666a408a5db77bea583c
parent430e5c53508bfcb01bafff3e443da42e91a156fa (diff)
downloadcdo-31b7ae17d1c09b97c6c690eba8abd70fc88f3e90.zip
cdo-31b7ae17d1c09b97c6c690eba8abd70fc88f3e90.tar.gz
cdo-31b7ae17d1c09b97c6c690eba8abd70fc88f3e90.tar.bz2
[234041] Prepare graduation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=234041
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java12
6 files changed, 13 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java
index d3a9c16..f9ab82e 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java
@@ -32,7 +32,7 @@ public class CDOServerProtocol extends CDOProtocolImpl
}
@Override
- protected SignalReactor doCreateSignalReactor(short signalID)
+ protected SignalReactor createSignalReactor(short signalID)
{
switch (signalID)
{
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java
index 04888af..3f69576 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocol.java
@@ -31,7 +31,7 @@ public class ServerProtocol extends SignalProtocol
}
@Override
- protected SignalReactor doCreateSignalReactor(short signalID)
+ protected SignalReactor createSignalReactor(short signalID)
{
switch (signalID)
{
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java
index d40205f..d698200 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocol.java
@@ -38,7 +38,7 @@ public class ClientProtocol extends SignalProtocol
}
@Override
- protected SignalReactor doCreateSignalReactor(short signalID)
+ protected SignalReactor createSignalReactor(short signalID)
{
switch (signalID)
{
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 fb1707c..d6d719b 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
@@ -29,7 +29,7 @@ public class JMSServerProtocol extends SignalProtocol
}
@Override
- protected SignalReactor doCreateSignalReactor(short signalID)
+ protected SignalReactor createSignalReactor(short signalID)
{
switch (signalID)
{
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 82ea5bd..099df23 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
@@ -40,7 +40,7 @@ public class TestSignalProtocol extends SignalProtocol
}
@Override
- protected SignalReactor doCreateSignalReactor(short signalID)
+ protected SignalReactor createSignalReactor(short signalID)
{
switch (signalID)
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
index 0367b0a..c55e1c2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java
@@ -156,7 +156,7 @@ public abstract class SignalProtocol extends Protocol
TRACER.trace("Got signal id " + signalID); //$NON-NLS-1$
}
- signal = createSignalReactor(signalID);
+ signal = provideSignalReactor(signalID);
signal.setProtocol(this);
signal.setCorrelationID(-correlationID);
signal.setBufferInputStream(new SignalInputStream(getInputStreamTimeout()));
@@ -199,10 +199,10 @@ public abstract class SignalProtocol extends Protocol
return MessageFormat.format("SignalProtocol[{0}]", getType()); //$NON-NLS-1$
}
- protected final SignalReactor createSignalReactor(short signalID)
+ protected final SignalReactor provideSignalReactor(short signalID)
{
checkActive();
- SignalReactor signal = doCreateSignalReactor(signalID);
+ SignalReactor signal = createSignalReactor(signalID);
if (signal == null)
{
throw new IllegalArgumentException("Invalid signalID " + signalID);
@@ -211,7 +211,11 @@ public abstract class SignalProtocol extends Protocol
return signal;
}
- protected abstract SignalReactor doCreateSignalReactor(short signalID);
+ /**
+ * Returns a new signal instance to serve the given signalID or <code>null</code> if the signalID is invalid for this
+ * protocol.
+ */
+ protected abstract SignalReactor createSignalReactor(short signalID);
void startSignal(SignalActor<?> signalActor, long timeout) throws Exception
{