diff options
| author | Eike Stepper | 2011-01-29 11:21:32 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-01-29 11:21:32 +0000 |
| commit | 28a1bb38436fe597f031e8e302ab0205fb244cf3 (patch) | |
| tree | f3fe7d3cc56e4e6de69e5d5754a38f0a40987a46 /plugins | |
| parent | 893654c3a46de6dba60cd8568624f217d3a8790c (diff) | |
| download | cdo-28a1bb38436fe597f031e8e302ab0205fb244cf3.tar.gz cdo-28a1bb38436fe597f031e8e302ab0205fb244cf3.tar.xz cdo-28a1bb38436fe597f031e8e302ab0205fb244cf3.zip | |
[283131] CDOObjects should send normal EMF notifications on rollback
https://bugs.eclipse.org/bugs/show_bug.cgi?id=283131
Diffstat (limited to 'plugins')
4 files changed, 1 insertions, 18 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java index 2cdabaa2d5..31e17d5e3a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java @@ -273,6 +273,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec */ public void cdoInternalPreLoad() { + // Do nothing } public void cdoInternalPostLoad() @@ -392,14 +393,6 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec // Do nothing } - /** - * @since 2.0 - */ - public void cdoInternalCleanup() - { - // Do nothing - } - public InternalEObject cdoInternalInstance() { return this; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java index 2ee2989293..4f964df769 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java @@ -293,11 +293,6 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper cdoInternalSetState(CDOState.CLEAN); } - public void cdoInternalCleanup() - { - // Do nothing - } - @Override public boolean equals(Object obj) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java index e019e44518..d5a2c96515 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java @@ -807,13 +807,10 @@ public abstract class AbstractCDOView extends Lifecycle implements InternalCDOVi */ protected synchronized void cleanObject(InternalCDOObject object, InternalCDORevision revision) { - object.cdoInternalCleanup(); - object.cdoInternalSetView(this); object.cdoInternalSetRevision(revision); object.cdoInternalSetID(revision.getID()); object.cdoInternalSetState(CDOState.CLEAN); - object.cdoInternalPostLoad(); } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java index b3ce09510b..359365c418 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOObject.java @@ -32,8 +32,6 @@ public interface InternalCDOObject extends CDOObject, InternalEObject, InternalC public InternalCDORevision cdoRevision(); - public void cdoInternalCleanup(); - public void cdoInternalPostAttach(); public void cdoInternalPostDetach(boolean remote); |