summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-24 15:15:22 (EDT)
committerEike Stepper2007-07-24 15:15:22 (EDT)
commitc48a338c648a1aa04ed9eafe5df5f9f75d591dd7 (patch)
treee556cd016d7cac4d45d41db5fbe5c4002282454e
parent2a30e2fe5bf3b0c46175a5953bca1fa69781edcf (diff)
downloadcdo-c48a338c648a1aa04ed9eafe5df5f9f75d591dd7.zip
cdo-c48a338c648a1aa04ed9eafe5df5f9f75d591dd7.tar.gz
cdo-c48a338c648a1aa04ed9eafe5df5f9f75d591dd7.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo/plugin.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java (renamed from plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/ChannelInjector.java)3
3 files changed, 15 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo/plugin.xml b/plugins/org.eclipse.emf.cdo/plugin.xml
index c8616b0..aa36f44 100644
--- a/plugins/org.eclipse.emf.cdo/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo/plugin.xml
@@ -19,7 +19,7 @@
<extension
point="org.eclipse.net4j.util.elementProcessors">
<elementProcessor
- class="org.eclipse.emf.internal.cdo.ChannelInjector">
+ class="org.eclipse.emf.internal.cdo.util.ChannelInjector">
</elementProcessor>
</extension>
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
index 8c0bbd8..831020b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java
@@ -121,20 +121,22 @@ public class CDOAdapterImpl extends AdapterImpl implements InternalCDOObject
@Override
public void notifyChanged(Notification msg)
{
- if (msg.getEventType() == Notification.RESOLVE)
- {
- return;
- }
-
- if (msg.getNotifier() instanceof InternalEObject)
+ switch (msg.getEventType())
{
+ case Notification.ADD:
+ case Notification.ADD_MANY:
+ case Notification.REMOVE:
+ case Notification.REMOVE_MANY:
+ case Notification.MOVE:
+ case Notification.SET:
+ case Notification.UNSET:
InternalEObject notifier = (InternalEObject)msg.getNotifier();
- if (!notifier.eIsProxy())
+ if (notifier != getTarget() || notifier.eIsProxy())
{
- System.out.println(msg);
- // TODO Implement method CDOAdapterImpl.notifyChanged()
- throw new UnsupportedOperationException("Not yet implemented");
+ return;
}
+
+ CDOStateMachine.INSTANCE.write(this);
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/ChannelInjector.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java
index 9a09d98..63f1785 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/ChannelInjector.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java
@@ -8,13 +8,14 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.emf.internal.cdo;
+package org.eclipse.emf.internal.cdo.util;
import org.eclipse.net4j.IConnector;
import org.eclipse.net4j.util.container.IElementProcessor;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.internal.cdo.CDOSessionImpl;
import org.eclipse.internal.net4j.ConnectorFactory;