diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server/src')
27 files changed, 82 insertions, 177 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java index 26fa024690..d193e65e3e 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java @@ -21,8 +21,9 @@ import org.eclipse.net4j.buffer.BufferOutputStream; */ public abstract class CDOReadIndication extends CDOServerIndication { - public CDOReadIndication() + public CDOReadIndication(CDOServerProtocol protocol, short signalID) { + super(protocol, signalID); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerIndication.java index 5c72fd007b..6a7ccaf4be 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerIndication.java @@ -40,8 +40,9 @@ import java.io.IOException; */ public abstract class CDOServerIndication extends IndicationWithResponse { - public CDOServerIndication() + public CDOServerIndication(CDOServerProtocol protocol, short signalID) { + super(protocol, signalID); } @Override 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 d88dbf012f..c608131120 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 @@ -50,70 +50,70 @@ public class CDOServerProtocol extends CDOProtocolImpl switch (signalID) { case CDOProtocolConstants.SIGNAL_OPEN_SESSION: - return new OpenSessionIndication(); + return new OpenSessionIndication(this); case CDOProtocolConstants.SIGNAL_LOAD_LIBRARIES: - return new LoadLibrariesIndication(); + return new LoadLibrariesIndication(this); case CDOProtocolConstants.SIGNAL_VIEWS_CHANGED: - return new ViewsChangedIndication(); + return new ViewsChangedIndication(this); case CDOProtocolConstants.SIGNAL_RESOURCE_ID: - return new ResourceIDIndication(); + return new ResourceIDIndication(this); case CDOProtocolConstants.SIGNAL_LOAD_PACKAGE: - return new LoadPackageIndication(); + return new LoadPackageIndication(this); case CDOProtocolConstants.SIGNAL_LOAD_REVISION: - return new LoadRevisionIndication(); + return new LoadRevisionIndication(this); case CDOProtocolConstants.SIGNAL_LOAD_REVISION_BY_TIME: - return new LoadRevisionByTimeIndication(); + return new LoadRevisionByTimeIndication(this); case CDOProtocolConstants.SIGNAL_LOAD_REVISION_BY_VERSION: - return new LoadRevisionByVersionIndication(); + return new LoadRevisionByVersionIndication(this); case CDOProtocolConstants.SIGNAL_LOAD_CHUNK: - return new LoadChunkIndication(); + return new LoadChunkIndication(this); case CDOProtocolConstants.SIGNAL_VERIFY_REVISION: - return new VerifyRevisionIndication(); + return new VerifyRevisionIndication(this); case CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION: - return new CommitTransactionIndication(); + return new CommitTransactionIndication(this); case CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE1: - return new CommitTransactionPhase1Indication(); + return new CommitTransactionPhase1Indication(this); case CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE2: - return new CommitTransactionPhase2Indication(); + return new CommitTransactionPhase2Indication(this); case CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE3: - return new CommitTransactionPhase3Indication(); + return new CommitTransactionPhase3Indication(this); case CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_CANCEL: - return new CommitTransactionCancelIndication(); + return new CommitTransactionCancelIndication(this); case CDOProtocolConstants.SIGNAL_QUERY: - return new QueryIndication(); + return new QueryIndication(this); case CDOProtocolConstants.SIGNAL_QUERY_CANCEL: - return new QueryCancelIndication(); + return new QueryCancelIndication(this); case CDOProtocolConstants.SIGNAL_SYNC: - return new SyncRevisionIndication(); + return new SyncRevisionIndication(this); case CDOProtocolConstants.SIGNAL_PASSIVE_UPDATE: - return new SetPassiveUpdateIndication(); + return new SetPassiveUpdateIndication(this); case CDOProtocolConstants.SIGNAL_CHANGE_SUBSCRIPTION: - return new ChangeSubscriptionIndication(); + return new ChangeSubscriptionIndication(this); case CDOProtocolConstants.SIGNAL_SET_AUDIT: - return new SetAuditIndication(); + return new SetAuditIndication(this); case CDOProtocolConstants.SIGNAL_REPOSITORY_TIME: - return new RepositoryTimeIndication(); + return new RepositoryTimeIndication(this); default: return null; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerRequest.java index 610254c7c6..86330d95e3 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerRequest.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerRequest.java @@ -34,9 +34,9 @@ import java.io.IOException; */ public abstract class CDOServerRequest extends Request { - public CDOServerRequest(IChannel channel) + public CDOServerRequest(IChannel channel, short signalID) { - super(extractProtocol(channel)); + super(extractProtocol(channel), signalID); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ChangeSubscriptionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ChangeSubscriptionIndication.java index b5b60a5a0a..7e031f90d0 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ChangeSubscriptionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ChangeSubscriptionIndication.java @@ -30,14 +30,9 @@ public class ChangeSubscriptionIndication extends CDOReadIndication private static final ContextTracer PROTOCOL_TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, ChangeSubscriptionIndication.class); - public ChangeSubscriptionIndication() + public ChangeSubscriptionIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_CHANGE_SUBSCRIPTION; + super(protocol, CDOProtocolConstants.SIGNAL_CHANGE_SUBSCRIPTION); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitNotificationRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitNotificationRequest.java index 5da9b233dc..819cb5e216 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitNotificationRequest.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitNotificationRequest.java @@ -44,7 +44,7 @@ public class CommitNotificationRequest extends CDOServerRequest public CommitNotificationRequest(IChannel channel, long timeStamp, List<CDOIDAndVersion> dirtyIDs, List<CDOID> detachedObjects, List<CDORevisionDelta> deltas) { - super(channel); + super(channel, CDOProtocolConstants.SIGNAL_COMMIT_NOTIFICATION); this.timeStamp = timeStamp; this.dirtyIDs = dirtyIDs; this.deltas = deltas; @@ -52,12 +52,6 @@ public class CommitNotificationRequest extends CDOServerRequest } @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_COMMIT_NOTIFICATION; - } - - @Override protected void requesting(CDODataOutput out) throws IOException { if (PROTOCOL_TRACER.isEnabled()) diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionCancelIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionCancelIndication.java index 2de96d322a..53e5e14df6 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionCancelIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionCancelIndication.java @@ -21,14 +21,9 @@ import java.io.IOException; */ public class CommitTransactionCancelIndication extends CommitTransactionIndication { - public CommitTransactionCancelIndication() + public CommitTransactionCancelIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_CANCEL; + super(protocol, CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_CANCEL); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java index 3a46b9f43c..4d5ae47888 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java @@ -46,14 +46,14 @@ public class CommitTransactionIndication extends CDOServerIndication protected InternalCommitContext commitContext; - public CommitTransactionIndication() + public CommitTransactionIndication(CDOServerProtocol protocol) { + super(protocol, CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION); } - @Override - protected short getSignalID() + protected CommitTransactionIndication(CDOServerProtocol protocol, short signalID) { - return CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION; + super(protocol, signalID); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase1Indication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase1Indication.java index 9b837e3b77..34be0e01f5 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase1Indication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase1Indication.java @@ -22,14 +22,9 @@ import java.io.IOException; */ public class CommitTransactionPhase1Indication extends CommitTransactionIndication { - public CommitTransactionPhase1Indication() + public CommitTransactionPhase1Indication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE1; + super(protocol, CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE1); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase2Indication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase2Indication.java index 81779ef670..828c3f53cd 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase2Indication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase2Indication.java @@ -32,14 +32,9 @@ public class CommitTransactionPhase2Indication extends CommitTransactionIndicati private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, CommitTransactionPhase2Indication.class); - public CommitTransactionPhase2Indication() + public CommitTransactionPhase2Indication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE2; + super(protocol, CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE2); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase3Indication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase3Indication.java index f7d007074f..4740310cb6 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase3Indication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionPhase3Indication.java @@ -21,14 +21,9 @@ import java.io.IOException; */ public class CommitTransactionPhase3Indication extends CommitTransactionIndication { - public CommitTransactionPhase3Indication() + public CommitTransactionPhase3Indication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE3; + super(protocol, CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION_PHASE3); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java index 0a952accb8..da1224f553 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadChunkIndication.java @@ -43,14 +43,9 @@ public class LoadChunkIndication extends CDOReadIndication private int toIndex; - public LoadChunkIndication() + public LoadChunkIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_LOAD_CHUNK; + super(protocol, CDOProtocolConstants.SIGNAL_LOAD_CHUNK); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java index e26c64a0a2..83a0b479c3 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadLibrariesIndication.java @@ -32,14 +32,9 @@ public class LoadLibrariesIndication extends CDOServerIndication private String[] libraryNames; - public LoadLibrariesIndication() + public LoadLibrariesIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_LOAD_LIBRARIES; + super(protocol, CDOProtocolConstants.SIGNAL_LOAD_LIBRARIES); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java index 96bf63227b..272939cfd1 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java @@ -31,14 +31,9 @@ public class LoadPackageIndication extends CDOReadIndication private boolean onlyEcore; - public LoadPackageIndication() + public LoadPackageIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_LOAD_PACKAGE; + super(protocol, CDOProtocolConstants.SIGNAL_LOAD_PACKAGE); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java index 43176249b1..98ed6151ca 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByTimeIndication.java @@ -30,14 +30,9 @@ public class LoadRevisionByTimeIndication extends LoadRevisionIndication private long timeStamp; - public LoadRevisionByTimeIndication() + public LoadRevisionByTimeIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_LOAD_REVISION_BY_TIME; + super(protocol, CDOProtocolConstants.SIGNAL_LOAD_REVISION_BY_TIME); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java index e39bd467ad..02087f89d5 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionByVersionIndication.java @@ -30,14 +30,9 @@ public class LoadRevisionByVersionIndication extends LoadRevisionIndication private int version; - public LoadRevisionByVersionIndication() + public LoadRevisionByVersionIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_LOAD_REVISION_BY_VERSION; + super(protocol, CDOProtocolConstants.SIGNAL_LOAD_REVISION_BY_VERSION); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java index d7c7777974..6ed1606723 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java @@ -52,14 +52,14 @@ public class LoadRevisionIndication extends CDOReadIndication protected int loadRevisionCollectionChunkSize; - public LoadRevisionIndication() + public LoadRevisionIndication(CDOServerProtocol protocol) { + super(protocol, CDOProtocolConstants.SIGNAL_LOAD_REVISION); } - @Override - protected short getSignalID() + public LoadRevisionIndication(CDOServerProtocol protocol, short signalID) { - return CDOProtocolConstants.SIGNAL_LOAD_REVISION; + super(protocol, signalID); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java index ee24c13a8d..951cf7eb45 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java @@ -41,14 +41,9 @@ public class OpenSessionIndication extends RepositoryTimeIndication private Session session; - public OpenSessionIndication() + public OpenSessionIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_OPEN_SESSION; + super(protocol, CDOProtocolConstants.SIGNAL_OPEN_SESSION); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryCancelIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryCancelIndication.java index e518425c73..8bf831cc2c 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryCancelIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryCancelIndication.java @@ -29,14 +29,9 @@ public class QueryCancelIndication extends CDOReadIndication private int queryID; - public QueryCancelIndication() + public QueryCancelIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_QUERY_CANCEL; + super(protocol, CDOProtocolConstants.SIGNAL_QUERY_CANCEL); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryIndication.java index 24c6900b39..6c7e126345 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/QueryIndication.java @@ -34,14 +34,9 @@ public class QueryIndication extends CDOReadIndication private QueryResult queryResult; - public QueryIndication() + public QueryIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_QUERY; + super(protocol, CDOProtocolConstants.SIGNAL_QUERY); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RepositoryTimeIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RepositoryTimeIndication.java index 2c0a5f9136..fbd98f518f 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RepositoryTimeIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RepositoryTimeIndication.java @@ -29,14 +29,14 @@ public class RepositoryTimeIndication extends CDOServerIndication private long indicated; - public RepositoryTimeIndication() + public RepositoryTimeIndication(CDOServerProtocol protocol) { + super(protocol, CDOProtocolConstants.SIGNAL_REPOSITORY_TIME); } - @Override - protected short getSignalID() + public RepositoryTimeIndication(CDOServerProtocol protocol, short signalID) { - return CDOProtocolConstants.SIGNAL_REPOSITORY_TIME; + super(protocol, signalID); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java index 656c056d83..56ae3a7a38 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java @@ -30,14 +30,9 @@ public class ResourceIDIndication extends CDOReadIndication private CDOID id; - public ResourceIDIndication() + public ResourceIDIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_RESOURCE_ID; + super(protocol, CDOProtocolConstants.SIGNAL_RESOURCE_ID); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SetAuditIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SetAuditIndication.java index 9b8d6260cd..08836d748a 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SetAuditIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SetAuditIndication.java @@ -34,14 +34,9 @@ public class SetAuditIndication extends CDOReadIndication private List<CDORevision> revisions; - public SetAuditIndication() + public SetAuditIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_SET_AUDIT; + super(protocol, CDOProtocolConstants.SIGNAL_SET_AUDIT); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SetPassiveUpdateIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SetPassiveUpdateIndication.java index 117cc6970f..b6636105cd 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SetPassiveUpdateIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SetPassiveUpdateIndication.java @@ -28,15 +28,9 @@ public class SetPassiveUpdateIndication extends SyncRevisionIndication private static final ContextTracer PROTOCOL_TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, SetPassiveUpdateIndication.class); - public SetPassiveUpdateIndication() + public SetPassiveUpdateIndication(CDOServerProtocol protocol) { - super(); - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_PASSIVE_UPDATE; + super(protocol, CDOProtocolConstants.SIGNAL_PASSIVE_UPDATE); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SyncRevisionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SyncRevisionIndication.java index 71e268b4dc..3214881b11 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SyncRevisionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/SyncRevisionIndication.java @@ -42,14 +42,14 @@ public class SyncRevisionIndication extends CDOReadIndication private int referenceChunk; - public SyncRevisionIndication() + public SyncRevisionIndication(CDOServerProtocol protocol) { + super(protocol, CDOProtocolConstants.SIGNAL_SYNC); } - @Override - protected short getSignalID() + public SyncRevisionIndication(CDOServerProtocol protocol, short signalID) { - return CDOProtocolConstants.SIGNAL_SYNC; + super(protocol, signalID); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/VerifyRevisionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/VerifyRevisionIndication.java index ec65ea1706..fa19e378f3 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/VerifyRevisionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/VerifyRevisionIndication.java @@ -32,14 +32,9 @@ public class VerifyRevisionIndication extends CDOReadIndication protected long[] timeStamps; - public VerifyRevisionIndication() + public VerifyRevisionIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_VERIFY_REVISION; + super(protocol, CDOProtocolConstants.SIGNAL_VERIFY_REVISION); } @Override diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java index e92879ceff..0d8285208c 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java @@ -23,16 +23,11 @@ import java.io.IOException; /** * @author Eike Stepper */ -public class ViewsChangedIndication extends CDOServerIndication // Indication +public class ViewsChangedIndication extends CDOServerIndication { - public ViewsChangedIndication() + public ViewsChangedIndication(CDOServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return CDOProtocolConstants.SIGNAL_VIEWS_CHANGED; + super(protocol, CDOProtocolConstants.SIGNAL_VIEWS_CHANGED); } @Override |