[253049] Give the infrastructure of an IProtocol a parametric type

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

2 files changed, 6 insertions, 5 deletions

diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
index 9546864e74..1faf91a87e 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/BuddiesClientProtocol.java
@@ -23,7 +23,7 @@ import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
 /**
  * @author Eike Stepper
  */
-public class BuddiesClientProtocol extends SignalProtocol
+public class BuddiesClientProtocol extends SignalProtocol<ClientSession>
 {
   private static final long GET_SESSION_TIMEOUT = 20000;
 
@@ -72,7 +72,7 @@ public class BuddiesClientProtocol extends SignalProtocol
 
   protected Self getSelf()
   {
-    ISession session = (ISession)getInfraStructure();
+    ISession session = getInfraStructure();
     return (Self)session.getSelf();
   }
 
@@ -81,7 +81,7 @@ public class BuddiesClientProtocol extends SignalProtocol
     int max = (int)(GET_SESSION_TIMEOUT / GET_SESSION_INTERVAL);
     for (int i = 0; i < max; i++)
     {
-      ClientSession session = (ClientSession)getInfraStructure();
+      ClientSession session = getInfraStructure();
       if (session == null)
       {
         ConcurrencyUtil.sleep(GET_SESSION_INTERVAL);
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 b9a8126a4a..39a2f8e467 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
@@ -68,8 +68,9 @@ public class OpenSessionRequest extends RequestWithConfirmation<IBuddySession>
       return null;
     }
 
-    ClientSession session = new ClientSession((BuddiesClientProtocol)getProtocol());
-    getProtocol().setInfraStructure(session);
+    BuddiesClientProtocol protocol = (BuddiesClientProtocol)getProtocol();
+    ClientSession session = new ClientSession(protocol);
+    protocol.setInfraStructure(session);
     session.setSelf(account, facilityTypes);
 
     int size = in.readInt();