1 files changed, 2 insertions, 43 deletions

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 b79787a92f..c9d2a1fdf7 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
@@ -10,20 +10,10 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.server.protocol;
 
-import org.eclipse.net4j.buddies.internal.protocol.BuddyStateIndication;
-import org.eclipse.net4j.buddies.internal.protocol.Collaboration;
-import org.eclipse.net4j.buddies.internal.protocol.MessageIndication;
 import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants;
-import org.eclipse.net4j.buddies.internal.server.ServerBuddy;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.IMessage;
-import org.eclipse.net4j.buddies.protocol.ISession;
-import org.eclipse.net4j.buddies.protocol.IBuddy.State;
-import org.eclipse.net4j.buddies.server.IBuddyAdmin;
 import org.eclipse.net4j.signal.SignalProtocol;
 import org.eclipse.net4j.signal.SignalReactor;
 
-import java.util.Map;
 
 /**
  * @author Eike Stepper
@@ -48,44 +38,13 @@ public class ServerProtocol extends SignalProtocol
       return new OpenSessionIndication();
 
     case ProtocolConstants.SIGNAL_BUDDY_STATE:
-      return new BuddyStateIndication()
-      {
-        @Override
-        protected void stateChanged(String userID, State state)
-        {
-          synchronized (IBuddyAdmin.INSTANCE)
-          {
-            Map<String, ISession> sessions = IBuddyAdmin.INSTANCE.getSessions();
-            ISession session = sessions.get(userID);
-            if (session != null)
-            {
-              ServerBuddy buddy = (ServerBuddy)session.getSelf();
-              buddy.setState(state);
-            }
-          }
-        }
-      };
+      return new ServerBuddyStateIndication();
 
     case ProtocolConstants.SIGNAL_INSTALL_FACILITY:
       return new InstallFacilityIndication();
 
     case ProtocolConstants.SIGNAL_MESSAGE:
-      return new MessageIndication()
-      {
-        @Override
-        protected void messageReceived(IMessage message)
-        {
-          synchronized (IBuddyAdmin.INSTANCE)
-          {
-            Map<String, ICollaboration> collaborations = IBuddyAdmin.INSTANCE.getCollaborations();
-            Collaboration collaboration = (Collaboration)collaborations.get(message.getCollaborationID());
-            if (collaboration != null)
-            {
-              collaboration.notifyMessage(message);
-            }
-          }
-        }
-      };
+      return new ServerMessageIndication();
     }
 
     return null;