[243987] Decouple Signal from IChannel

https://bugs.eclipse.org/bugs/show_bug.cgi?id=243987

15 files changed, 43 insertions, 88 deletions

diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
index ccd971305d..1b74a92e22 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java
@@ -10,10 +10,9 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies;
 
-import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
 import org.eclipse.net4j.buddies.spi.common.ClientFacilityFactory;
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.connector.IConnector;
+import org.eclipse.net4j.internal.buddies.protocol.BuddiesClientProtocol;
 import org.eclipse.net4j.internal.buddies.protocol.OpenSessionRequest;
 import org.eclipse.net4j.signal.SignalActor;
 import org.eclipse.net4j.util.WrappedException;
@@ -39,8 +38,8 @@ public final class BuddiesUtil
   {
     try
     {
-      IChannel channel = connector.openChannel(ProtocolConstants.PROTOCOL_NAME, null);
-      OpenSessionRequest request = new OpenSessionRequest(channel, userID, password, getFacilityTypes());
+      BuddiesClientProtocol protocol = new BuddiesClientProtocol(connector);
+      OpenSessionRequest request = new OpenSessionRequest(protocol, userID, password, getFacilityTypes());
       return request.send(timeout);
     }
     catch (Exception ex)
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
index 69e53ff0d3..5e6096bbce 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java
@@ -13,15 +13,12 @@ package org.eclipse.net4j.buddies;
 import org.eclipse.net4j.buddies.common.IBuddy;
 import org.eclipse.net4j.buddies.common.IBuddyContainer;
 import org.eclipse.net4j.buddies.common.ISession;
-import org.eclipse.net4j.channel.IChannel;
 
 /**
  * @author Eike Stepper
  */
 public interface IBuddySession extends ISession, IBuddyContainer
 {
-  public IChannel getChannel();
-
   public IBuddy getSelf();
 
   public void close();
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java
index 52524c6959..59bf9a9322 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java
@@ -21,7 +21,7 @@ import org.eclipse.net4j.buddies.internal.common.protocol.MessageNotification;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
 import org.eclipse.net4j.buddies.spi.common.ClientFacilityFactory;
 import org.eclipse.net4j.buddies.spi.common.Message;
-import org.eclipse.net4j.channel.IChannel;
+import org.eclipse.net4j.internal.buddies.protocol.BuddiesClientProtocol;
 import org.eclipse.net4j.internal.buddies.protocol.InstallFacilityRequest;
 import org.eclipse.net4j.internal.buddies.protocol.InviteBuddiesNotification;
 import org.eclipse.net4j.util.WrappedException;
@@ -62,8 +62,8 @@ public class BuddyCollaboration extends Collaboration implements IBuddyCollabora
     {
       try
       {
-        IChannel channel = session.getChannel();
-        boolean success = new InstallFacilityRequest(channel, getID(), type).send(ProtocolConstants.TIMEOUT);
+        BuddiesClientProtocol protocol = (BuddiesClientProtocol)session.getProtocol();
+        boolean success = new InstallFacilityRequest(protocol, getID(), type).send(ProtocolConstants.TIMEOUT);
         if (!success)
         {
           return null;
@@ -96,8 +96,8 @@ public class BuddyCollaboration extends Collaboration implements IBuddyCollabora
 
     try
     {
-      IChannel channel = session.getChannel();
-      new MessageNotification(channel, collaborationID, facilityType, message).send();
+      BuddiesClientProtocol protocol = (BuddiesClientProtocol)session.getProtocol();
+      new MessageNotification(protocol, collaborationID, facilityType, message).send();
     }
     catch (Exception ex)
     {
@@ -134,8 +134,8 @@ public class BuddyCollaboration extends Collaboration implements IBuddyCollabora
     {
       try
       {
-        IChannel channel = session.getChannel();
-        new InviteBuddiesNotification(channel, getID(), invitations).send();
+        BuddiesClientProtocol protocol = (BuddiesClientProtocol)session.getProtocol();
+        new InviteBuddiesNotification(protocol, getID(), invitations).send();
       }
       catch (Exception ex)
       {
@@ -148,8 +148,8 @@ public class BuddyCollaboration extends Collaboration implements IBuddyCollabora
   {
     try
     {
-      IChannel channel = session.getChannel();
-      new CollaborationLeftNotification(channel, getID(), session.getSelf().getUserID()).send();
+      BuddiesClientProtocol protocol = (BuddiesClientProtocol)session.getProtocol();
+      new CollaborationLeftNotification(protocol, getID(), session.getSelf().getUserID()).send();
     }
     catch (Exception ex)
     {
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java
index 02ee9890ac..0ca3a32001 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java
@@ -18,8 +18,8 @@ import org.eclipse.net4j.buddies.common.IMembership;
 import org.eclipse.net4j.buddies.internal.common.BuddyContainer;
 import org.eclipse.net4j.buddies.internal.common.Collaboration;
 import org.eclipse.net4j.buddies.internal.common.protocol.BuddyStateNotification;
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.internal.buddies.bundle.OM;
+import org.eclipse.net4j.internal.buddies.protocol.BuddiesClientProtocol;
 import org.eclipse.net4j.util.event.IEvent;
 import org.eclipse.net4j.util.event.IListener;
 import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
@@ -35,18 +35,18 @@ import java.util.Set;
  */
 public class ClientSession extends BuddyContainer implements IBuddySession, IListener
 {
-  private IChannel channel;
+  private BuddiesClientProtocol protocol;
 
   private Self self;
 
-  public ClientSession(IChannel channel)
+  public ClientSession(BuddiesClientProtocol protocol)
   {
-    this.channel = channel;
+    this.protocol = protocol;
   }
 
-  public IChannel getChannel()
+  public BuddiesClientProtocol getProtocol()
   {
-    return channel;
+    return protocol;
   }
 
   public Self getSelf()
@@ -63,7 +63,8 @@ public class ClientSession extends BuddyContainer implements IBuddySession, ILis
 
   public void close()
   {
-    channel.close();
+    protocol.close();
+    protocol = null;
     deactivate();
   }
 
@@ -79,7 +80,7 @@ public class ClientSession extends BuddyContainer implements IBuddySession, ILis
   @Override
   public void notifyEvent(IEvent event)
   {
-    if (event.getSource() == channel)
+    if (event.getSource() == protocol)
     {
       if (event instanceof ILifecycleEvent)
       {
@@ -95,7 +96,7 @@ public class ClientSession extends BuddyContainer implements IBuddySession, ILis
       {
         try
         {
-          new BuddyStateNotification(channel, self.getUserID(), ((IBuddyStateEvent)event).getNewState()).send();
+          new BuddyStateNotification(protocol, self.getUserID(), ((IBuddyStateEvent)event).getNewState()).send();
         }
         catch (Exception ex)
         {
@@ -131,13 +132,13 @@ public class ClientSession extends BuddyContainer implements IBuddySession, ILis
   protected void doActivate() throws Exception
   {
     super.doActivate();
-    channel.addListener(this);
+    protocol.addListener(this);
   }
 
   @Override
   protected void doDeactivate() throws Exception
   {
-    channel.removeListener(this);
+    protocol.removeListener(this);
     LifecycleUtil.deactivate(self);
     super.doDeactivate();
   }
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
index eba0c18e1c..a31376042d 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java
@@ -16,7 +16,6 @@ import org.eclipse.net4j.buddies.common.IMembership;
 import org.eclipse.net4j.buddies.internal.common.Buddy;
 import org.eclipse.net4j.buddies.internal.common.Membership;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.internal.buddies.protocol.InitiateCollaborationRequest;
 import org.eclipse.net4j.util.WrappedException;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
@@ -60,8 +59,7 @@ public class Self extends Buddy
     try
     {
       ClientSession session = getSession();
-      IChannel channel = session.getChannel();
-      long id = new InitiateCollaborationRequest(channel, buddies).send(ProtocolConstants.TIMEOUT);
+      long id = new InitiateCollaborationRequest(session.getProtocol(), buddies).send(ProtocolConstants.TIMEOUT);
 
       BuddyCollaboration collaboration = new BuddyCollaboration(session, id);
       collaboration.activate();
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/BuddiesClientProtocol.java
index d69820092f..23c0b2882a 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/BuddiesClientProtocol.java
@@ -13,6 +13,7 @@ package org.eclipse.net4j.internal.buddies.protocol;
 import org.eclipse.net4j.buddies.common.ISession;
 import org.eclipse.net4j.buddies.internal.common.protocol.MessageIndication;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
+import org.eclipse.net4j.connector.IConnector;
 import org.eclipse.net4j.internal.buddies.ClientSession;
 import org.eclipse.net4j.internal.buddies.Self;
 import org.eclipse.net4j.signal.SignalProtocol;
@@ -22,14 +23,15 @@ import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
 /**
  * @author Eike Stepper
  */
-public class ClientProtocol extends SignalProtocol
+public class BuddiesClientProtocol extends SignalProtocol
 {
   private static final long GET_SESSION_TIMEOUT = 20000;
 
   private static final int GET_SESSION_INTERVAL = 100;
 
-  public ClientProtocol()
+  public BuddiesClientProtocol(IConnector connector)
   {
+    super(connector);
   }
 
   public String getType()
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
index a607e5d049..0c8b1fc5c7 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyAddedIndication.java
@@ -36,7 +36,7 @@ public class BuddyAddedIndication extends Indication
   protected void indicating(ExtendedDataInputStream in) throws IOException
   {
     String buddy = in.readString();
-    ClientSession session = ((ClientProtocol)getProtocol()).getSession();
+    ClientSession session = ((BuddiesClientProtocol)getProtocol()).getSession();
     session.buddyAdded(buddy);
   }
 }
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
index a4c509f27f..318c14ec57 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddyRemovedIndication.java
@@ -36,7 +36,7 @@ public class BuddyRemovedIndication extends Indication
   protected void indicating(ExtendedDataInputStream in) throws IOException
   {
     String buddy = in.readString();
-    ClientSession session = ((ClientProtocol)getProtocol()).getSession();
+    ClientSession session = ((BuddiesClientProtocol)getProtocol()).getSession();
     session.buddyRemoved(buddy);
   }
 }
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
index 50cb4e17b8..bcb947d29c 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java
@@ -27,7 +27,7 @@ public class ClientBuddyStateIndication extends BuddyStateIndication
   @Override
   protected void stateChanged(final String userID, final State state)
   {
-    ClientSession session = ((ClientProtocol)getProtocol()).getSession();
+    ClientSession session = ((BuddiesClientProtocol)getProtocol()).getSession();
     ClientBuddy buddy = (ClientBuddy)session.getBuddy(userID);
     if (buddy != null)
     {
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java
deleted file mode 100644
index 41e65aad62..0000000000
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.net4j.internal.buddies.protocol;
-
-import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
-import org.eclipse.net4j.util.container.IManagedContainer;
-
-/**
- * @author Eike Stepper
- */
-public final class ClientProtocolFactory extends org.eclipse.net4j.protocol.ClientProtocolFactory
-{
-  public static final String TYPE = ProtocolConstants.PROTOCOL_NAME;
-
-  public ClientProtocolFactory()
-  {
-    super(TYPE);
-  }
-
-  public ClientProtocol create(String description)
-  {
-    return new ClientProtocol();
-  }
-
-  public static ClientProtocol get(IManagedContainer container, String description)
-  {
-    return (ClientProtocol)container.getElement(PRODUCT_GROUP, TYPE, description);
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
index c8f6e911c0..73baf6e277 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java
@@ -13,7 +13,6 @@ package org.eclipse.net4j.internal.buddies.protocol;
 import org.eclipse.net4j.buddies.common.IBuddy;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.signal.RequestWithConfirmation;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
@@ -28,9 +27,9 @@ public class InitiateCollaborationRequest extends RequestWithConfirmation<Long>
 {
   private Collection<IBuddy> buddies;
 
-  public InitiateCollaborationRequest(IChannel channel, Collection<IBuddy> buddies)
+  public InitiateCollaborationRequest(BuddiesClientProtocol protocol, Collection<IBuddy> buddies)
   {
-    super(channel);
+    super(protocol);
     this.buddies = buddies;
   }
 
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
index c2773b1d6d..b83b59cdb9 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java
@@ -11,7 +11,6 @@
 package org.eclipse.net4j.internal.buddies.protocol;
 
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.signal.RequestWithConfirmation;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
@@ -27,9 +26,9 @@ public class InstallFacilityRequest extends RequestWithConfirmation<Boolean>
 
   private String facilityType;
 
-  public InstallFacilityRequest(IChannel channel, long collaborationID, String facilityType)
+  public InstallFacilityRequest(BuddiesClientProtocol protocol, long collaborationID, String facilityType)
   {
-    super(channel);
+    super(protocol);
     this.collaborationID = collaborationID;
     this.facilityType = facilityType;
   }
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
index c469fba9a5..9e8ec9b692 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java
@@ -13,7 +13,6 @@ package org.eclipse.net4j.internal.buddies.protocol;
 import org.eclipse.net4j.buddies.common.IBuddy;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.signal.Request;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 
@@ -29,9 +28,9 @@ public class InviteBuddiesNotification extends Request
 
   private Collection<IBuddy> buddies;
 
-  public InviteBuddiesNotification(IChannel channel, long collaborationID, Collection<IBuddy> buddies)
+  public InviteBuddiesNotification(BuddiesClientProtocol protocol, long collaborationID, Collection<IBuddy> buddies)
   {
-    super(channel);
+    super(protocol);
     this.buddies = buddies;
     this.collaborationID = collaborationID;
   }
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
index db1b690d6a..0520177d7a 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java
@@ -13,7 +13,6 @@ package org.eclipse.net4j.internal.buddies.protocol;
 import org.eclipse.net4j.buddies.common.IAccount;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.signal.RequestWithConfirmation;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
@@ -27,9 +26,9 @@ public class LoadAccountRequest extends RequestWithConfirmation<IAccount>
 {
   private String userID;
 
-  public LoadAccountRequest(IChannel channel, String userID)
+  public LoadAccountRequest(BuddiesClientProtocol protocol, String userID)
   {
-    super(channel);
+    super(protocol);
     this.userID = userID;
   }
 
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
index a13e369485..b9a8126a4a 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java
@@ -14,7 +14,6 @@ import org.eclipse.net4j.buddies.IBuddySession;
 import org.eclipse.net4j.buddies.common.IAccount;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolConstants;
 import org.eclipse.net4j.buddies.internal.common.protocol.ProtocolUtil;
-import org.eclipse.net4j.channel.IChannel;
 import org.eclipse.net4j.internal.buddies.ClientSession;
 import org.eclipse.net4j.signal.RequestWithConfirmation;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
@@ -34,9 +33,9 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession>
 
   private Set<String> facilityTypes;
 
-  public OpenSessionRequest(IChannel channel, String userID, String password, Set<String> facilityTypes)
+  public OpenSessionRequest(BuddiesClientProtocol protocol, String userID, String password, Set<String> facilityTypes)
   {
-    super(channel);
+    super(protocol);
     this.userID = userID;
     this.password = password;
     this.facilityTypes = facilityTypes;
@@ -69,7 +68,7 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession>
       return null;
     }
 
-    ClientSession session = new ClientSession(getProtocol().getChannel());
+    ClientSession session = new ClientSession((BuddiesClientProtocol)getProtocol());
     getProtocol().setInfraStructure(session);
     session.setSelf(account, facilityTypes);