From 16b12d5befb2aafd4788e27a2bbefe73ef7501d1 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Tue, 9 Oct 2007 06:28:40 +0000
Subject: [205668] Provide buddies example
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=205668

---
 .../src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java  | 6 ++++--
 .../src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java | 1 +
 .../org/eclipse/net4j/buddies/internal/server/ServerSession.java   | 2 --
 .../src/org/eclipse/net4j/internal/buddies/ClientBuddy.java        | 7 +++----
 .../src/org/eclipse/net4j/internal/buddies/Self.java               | 7 +++----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java
index 7fb80f7ca1..1a39db0cf3 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java
@@ -85,10 +85,12 @@ public class BuddyAdmin extends Lifecycle implements IBuddyAdmin, IListener
 
     ServerSession session = new ServerSession(channel, buddy);
     ((IProtocol)channel.getReceiveHandler()).setInfraStructure(session);
-
-    sessions.put(userID, session);
     session.addListener(this);
+    buddy.setSession(session);
+    LifecycleUtil.activate(session);
+
     if (TRACER.isEnabled()) TRACER.trace("Opened session: " + userID);
+    sessions.put(userID, session);
     return session;
   }
 
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
index 22f70b3121..04b0cf8439 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerBuddy.java
@@ -22,6 +22,7 @@ public class ServerBuddy extends Buddy
 
   public ServerBuddy(IAccount account)
   {
+    super(null);
     this.account = account;
   }
 
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java
index 0716c4b7e2..d5ae6bfcc3 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java
@@ -17,7 +17,6 @@ import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
 import org.eclipse.net4j.util.event.IEvent;
 import org.eclipse.net4j.util.event.IListener;
 import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
 
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.PlatformObject;
@@ -35,7 +34,6 @@ public class ServerSession extends Lifecycle implements ISession, IListener
   {
     this.channel = channel;
     this.self = self;
-    LifecycleUtil.activate(this);
   }
 
   public IChannel getChannel()
diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
index 5d13acb496..e618120b48 100644
--- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
+++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientBuddy.java
@@ -18,21 +18,20 @@ import org.eclipse.net4j.buddies.protocol.IAccount;
  */
 public class ClientBuddy extends Buddy
 {
-  private ClientSession session;
-
   private String userID;
 
   private IAccount account;
 
   public ClientBuddy(ClientSession session, String userID)
   {
-    this.session = session;
+    super(session);
     this.userID = userID;
   }
 
+  @Override
   public ClientSession getSession()
   {
-    return session;
+    return (ClientSession)super.getSession();
   }
 
   public String getUserID()
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 7769b38fbe..a9038403e2 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
@@ -18,19 +18,18 @@ import org.eclipse.net4j.buddies.protocol.IAccount;
  */
 public class Self extends Buddy
 {
-  private ClientSession session;
-
   private IAccount account;
 
   protected Self(ClientSession session, IAccount account)
   {
-    this.session = session;
+    super(session);
     this.account = account;
   }
 
+  @Override
   public ClientSession getSession()
   {
-    return session;
+    return (ClientSession)super.getSession();
   }
 
   public String getUserID()
-- 
cgit v1.2.3