diff options
author | Eike Stepper | 2008-11-01 11:23:00 +0000 |
---|---|---|
committer | Eike Stepper | 2008-11-01 11:23:00 +0000 |
commit | 1bd480f81f09442906779ec673d77ef27d883a95 (patch) | |
tree | 1fa4775624fb65b31e44633b1b0372e0f975eca4 /plugins/org.eclipse.net4j.buddies.server | |
parent | f24d82af2542d10c9eab5ace82b7177fed1917c2 (diff) | |
download | cdo-1bd480f81f09442906779ec673d77ef27d883a95.tar.gz cdo-1bd480f81f09442906779ec673d77ef27d883a95.tar.xz cdo-1bd480f81f09442906779ec673d77ef27d883a95.zip |
[253054] [POLISH] Pass protocol and signalID in Signal constructor
https://bugs.eclipse.org/bugs/show_bug.cgi?id=253054
Diffstat (limited to 'plugins/org.eclipse.net4j.buddies.server')
12 files changed, 53 insertions, 75 deletions
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 6c2d084b9e..afd49db81c 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 @@ -39,25 +39,28 @@ public class BuddiesServerProtocol extends SignalProtocol<ServerSession> switch (signalID) { case ProtocolConstants.SIGNAL_OPEN_SESSION: - return new OpenSessionIndication(); + return new OpenSessionIndication(this); + + case ProtocolConstants.SIGNAL_LOAD_ACCOUNT: + return new LoadAccountIndication(this); case ProtocolConstants.SIGNAL_BUDDY_STATE: - return new ServerBuddyStateIndication(); + return new ServerBuddyStateIndication(this); case ProtocolConstants.SIGNAL_INSTALL_FACILITY: - return new InstallFacilityIndication(); + return new InstallFacilityIndication(this); case ProtocolConstants.SIGNAL_INITIATE_COLLABORATION: - return new InitiateCollaborationIndication(); + return new InitiateCollaborationIndication(this); case ProtocolConstants.SIGNAL_INVITE_BUDDIES: - return new InviteBuddiesIndication(); + return new InviteBuddiesIndication(this); case ProtocolConstants.SIGNAL_COLLABORATION_LEFT: - return new ServerCollaborationLeftIndication(); + return new ServerCollaborationLeftIndication(this); case ProtocolConstants.SIGNAL_MESSAGE: - return new MessageIndication(IBuddyAdmin.INSTANCE); + return new MessageIndication(this, IBuddyAdmin.INSTANCE); default: return null; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java index bd6de9eafa..b98d316b24 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java @@ -12,6 +12,7 @@ package org.eclipse.net4j.buddies.internal.server.protocol; import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants; import org.eclipse.net4j.signal.Request; +import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; import java.io.IOException; @@ -26,19 +27,13 @@ public class BuddyAddedNotification extends Request /** * @since 2.0 */ - public BuddyAddedNotification(BuddiesServerProtocol protocol, String buddy) + public BuddyAddedNotification(SignalProtocol<?> protocol, String buddy) { - super(protocol); + super(protocol, ProtocolConstants.SIGNAL_BUDDY_ADDED); this.buddy = buddy; } @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_BUDDY_ADDED; - } - - @Override protected void requesting(ExtendedDataOutputStream out) throws IOException { out.writeString(buddy); diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java index 5fdf1ed671..6e82efacce 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java @@ -12,6 +12,7 @@ package org.eclipse.net4j.buddies.internal.server.protocol; import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants; import org.eclipse.net4j.signal.Request; +import org.eclipse.net4j.signal.SignalProtocol; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; import java.io.IOException; @@ -26,19 +27,13 @@ public class BuddyRemovedNotification extends Request /** * @since 2.0 */ - public BuddyRemovedNotification(BuddiesServerProtocol protocol, String buddy) + public BuddyRemovedNotification(SignalProtocol<?> protocol, String buddy) { - super(protocol); + super(protocol, ProtocolConstants.SIGNAL_BUDDY_REMOVED); this.buddy = buddy; } @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_BUDDY_REMOVED; - } - - @Override protected void requesting(ExtendedDataOutputStream out) throws IOException { out.writeString(buddy); diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java index 4c5430bbe5..9f9c8a7ee3 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java @@ -36,19 +36,13 @@ public class CollaborationInitiatedNotification extends Request public CollaborationInitiatedNotification(BuddiesServerProtocol protocol, long collaborationID, Collection<IBuddy> buddies, String[] facilityTypes) { - super(protocol); + super(protocol, ProtocolConstants.SIGNAL_COLLABORATION_INITIATED); this.collaborationID = collaborationID; this.buddies = buddies; this.facilityTypes = facilityTypes; } @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_COLLABORATION_INITIATED; - } - - @Override protected void requesting(ExtendedDataOutputStream out) throws IOException { out.writeLong(collaborationID); diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java index b10576606a..ef484aaf89 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java @@ -30,18 +30,12 @@ public class FacilityInstalledNotification extends Request */ public FacilityInstalledNotification(BuddiesServerProtocol protocol, long collaborationID, String facilityType) { - super(protocol); + super(protocol, ProtocolConstants.SIGNAL_FACILITY_INSTALLED); this.collaborationID = collaborationID; this.facilityType = facilityType; } @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_FACILITY_INSTALLED; - } - - @Override protected void requesting(ExtendedDataOutputStream out) throws IOException { out.writeLong(collaborationID); diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java index 8d594f92e4..b445c36808 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InitiateCollaborationIndication.java @@ -29,14 +29,12 @@ public class InitiateCollaborationIndication extends IndicationWithResponse { private ICollaboration collaboration; - public InitiateCollaborationIndication() + /** + * @since 2.0 + */ + public InitiateCollaborationIndication(BuddiesServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_INITIATE_COLLABORATION; + super(protocol, ProtocolConstants.SIGNAL_INITIATE_COLLABORATION); } @Override diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java index 8bbcb9ac7f..da479ae9a7 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java @@ -34,14 +34,12 @@ public class InstallFacilityIndication extends IndicationWithResponse private boolean success; - public InstallFacilityIndication() + /** + * @since 2.0 + */ + public InstallFacilityIndication(BuddiesServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_INSTALL_FACILITY; + super(protocol, ProtocolConstants.SIGNAL_INSTALL_FACILITY); } @Override diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java index 029c15cc2c..74dbbea887 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java @@ -31,14 +31,12 @@ import java.util.Set; */ public class InviteBuddiesIndication extends Indication { - public InviteBuddiesIndication() + /** + * @since 2.0 + */ + public InviteBuddiesIndication(BuddiesServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_INVITE_BUDDIES; + super(protocol, ProtocolConstants.SIGNAL_INVITE_BUDDIES); } @Override diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java index a9002dafac..fd5bf26be5 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java @@ -27,14 +27,12 @@ public class LoadAccountIndication extends IndicationWithResponse { private IAccount account; - public LoadAccountIndication() + /** + * @since 2.0 + */ + public LoadAccountIndication(BuddiesServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_LOAD_ACCOUNT; + super(protocol, ProtocolConstants.SIGNAL_LOAD_ACCOUNT); } @Override diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java index cddf28c57e..f3ddcff680 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java @@ -34,14 +34,12 @@ public class OpenSessionIndication extends IndicationWithResponse private IBuddy[] buddies; - public OpenSessionIndication() + /** + * @since 2.0 + */ + public OpenSessionIndication(BuddiesServerProtocol protocol) { - } - - @Override - protected short getSignalID() - { - return ProtocolConstants.SIGNAL_OPEN_SESSION; + super(protocol, ProtocolConstants.SIGNAL_OPEN_SESSION); } @Override diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java index e7c4ef3c59..3df2673247 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java @@ -21,8 +21,12 @@ import org.eclipse.net4j.buddies.server.IBuddyAdmin; */ public class ServerBuddyStateIndication extends BuddyStateIndication { - public ServerBuddyStateIndication() + /** + * @since 2.0 + */ + public ServerBuddyStateIndication(BuddiesServerProtocol protocol) { + super(protocol); } @Override diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java index 46cef3764d..60dc41cd9b 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java @@ -25,9 +25,12 @@ import org.eclipse.net4j.util.WrappedException; */ public class ServerCollaborationLeftIndication extends CollaborationLeftIndication { - public ServerCollaborationLeftIndication() + /** + * @since 2.0 + */ + public ServerCollaborationLeftIndication(BuddiesServerProtocol protocol) { - super(IBuddyAdmin.INSTANCE, IBuddyAdmin.INSTANCE); + super(protocol, IBuddyAdmin.INSTANCE, IBuddyAdmin.INSTANCE); } @Override |