summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-11-12 05:43:18 (EST)
committerEike Stepper2007-11-12 05:43:18 (EST)
commit8dd25fd9067322ce2dab81b248b6bf3dc15eef31 (patch)
tree17fdada93c22e3aeb65109887ebc75a2b3c53b37
parent58e93080c332a30d5506b5bbab74218bb809f199 (diff)
downloadcdo-8dd25fd9067322ce2dab81b248b6bf3dc15eef31.zip
cdo-8dd25fd9067322ce2dab81b248b6bf3dc15eef31.tar.gz
cdo-8dd25fd9067322ce2dab81b248b6bf3dc15eef31.tar.bz2
[209380] Add invitation capability for multi buddy collaborations
https://bugs.eclipse.org/bugs/show_bug.cgi?id=209380
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml8
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java14
2 files changed, 4 insertions, 18 deletions
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
index d30019e..611662f 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
@@ -37,17 +37,17 @@
databaseName="/temp/cdodb1"
createDatabase="create"/> -->
- <!--<dbAdapter name="derby"/>
+ <dbAdapter name="derby"/>
<dataSource
driverClass="org.apache.derby.jdbc.ClientDataSource"
databaseName="cdodb1"
- createDatabase="create"/>-->
+ createDatabase="create"/>
- <dbAdapter name="hsqldb"/>
+ <!--<dbAdapter name="hsqldb"/>
<dataSource
driverClass="org.eclipse.net4j.db.hsqldb.HSQLDBDataSource"
database="jdbc:hsqldb:mem:cdodb1"
- user="sa"/>
+ user="sa"/>-->
<!--<dbAdapter name="mysql"/>
<dataSource
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java
index d5135d4..ef27016 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java
@@ -12,9 +12,6 @@ package org.eclipse.net4j.buddies.internal.ui;
import org.eclipse.net4j.buddies.protocol.IMembership;
import org.eclipse.net4j.internal.buddies.Self;
-import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycle;
import org.eclipse.net4j.util.ui.views.IElementFilter;
import org.eclipse.swt.graphics.Image;
@@ -86,16 +83,6 @@ public class CollaborationsItemProvider extends AbstractItemProvider
{
private Self self;
- private IListener membershipListener = new LifecycleEventAdapter()
- {
- @Override
- protected void onDeactivated(ILifecycle lifecycle)
- {
- IMembership membership = (IMembership)lifecycle;
- // onRemoved(self, membership.getCollaboration());
- }
- };
-
public SelfNode(Self self)
{
super(null);
@@ -121,7 +108,6 @@ public class CollaborationsItemProvider extends AbstractItemProvider
protected Node addChild(Collection<Node> children, Object element)
{
IMembership membership = (IMembership)element;
- // membership.addListener(membershipListener);
return super.addChild(children, membership.getCollaboration());
}
}