summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-11-12 05:06:06 (EST)
committerEike Stepper2007-11-12 05:06:06 (EST)
commitbbb340455411f643c7d95f6eed8a8e722ec0015d (patch)
treeca399664fe763af5090b3029593a524589128a58
parentf9eff9095f2c4f5bb255c0fc89c33536d87b7f17 (diff)
downloadcdo-bbb340455411f643c7d95f6eed8a8e722ec0015d.zip
cdo-bbb340455411f643c7d95f6eed8a8e722ec0015d.tar.gz
cdo-bbb340455411f643c7d95f6eed8a8e722ec0015d.tar.bz2
[209380] Add invitation capability for multi buddy collaborations
https://bugs.eclipse.org/bugs/show_bug.cgi?id=209380
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java5
-rw-r--r--plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java9
2 files changed, 9 insertions, 5 deletions
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 e7f4405..41525aa 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
@@ -1,5 +1,6 @@
package org.eclipse.net4j.buddies.internal.server.protocol;
+import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.buddies.internal.protocol.Buddy;
import org.eclipse.net4j.buddies.internal.protocol.Collaboration;
import org.eclipse.net4j.buddies.internal.protocol.CollaborationLeftIndication;
@@ -30,8 +31,8 @@ public class ServerCollaborationLeftIndication extends CollaborationLeftIndicati
{
try
{
- new CollaborationLeftNotification(member.getSession().getChannel(), collaboration.getID(), member.getUserID())
- .send();
+ IChannel channel = member.getSession().getChannel();
+ new CollaborationLeftNotification(channel, collaboration.getID(), buddy.getUserID()).send();
}
catch (Exception ex)
{
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 028bb6f..f2d1f47 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
@@ -96,7 +96,8 @@ public class BuddyCollaboration extends Collaboration implements IBuddyCollabora
try
{
- new MessageNotification(session.getChannel(), collaborationID, facilityType, message).send();
+ IChannel channel = session.getChannel();
+ new MessageNotification(channel, collaborationID, facilityType, message).send();
}
catch (Exception ex)
{
@@ -133,7 +134,8 @@ public class BuddyCollaboration extends Collaboration implements IBuddyCollabora
{
try
{
- new InviteBuddiesNotification(session.getChannel(), getID(), invitations).send();
+ IChannel channel = session.getChannel();
+ new InviteBuddiesNotification(channel, getID(), invitations).send();
}
catch (Exception ex)
{
@@ -146,7 +148,8 @@ public class BuddyCollaboration extends Collaboration implements IBuddyCollabora
{
try
{
- new CollaborationLeftNotification(session.getChannel(), getID(), session.getSelf().getUserID()).send();
+ IChannel channel = session.getChannel();
+ new CollaborationLeftNotification(channel, getID(), session.getSelf().getUserID()).send();
}
catch (Exception ex)
{