diff options
author | Eike Stepper | 2007-08-03 20:43:43 +0000 |
---|---|---|
committer | Eike Stepper | 2007-08-03 20:43:43 +0000 |
commit | f5abb9a9b32e8eda188dbea2fc1d2f6023acf9ec (patch) | |
tree | 3ece09584e5aa2175817d4d6fcaa7d377eee86be | |
parent | 1a0589dfba069627ac7d77984fb11dc87f6cd902 (diff) | |
download | cdo-f5abb9a9b32e8eda188dbea2fc1d2f6023acf9ec.tar.gz cdo-f5abb9a9b32e8eda188dbea2fc1d2f6023acf9ec.tar.xz cdo-f5abb9a9b32e8eda188dbea2fc1d2f6023acf9ec.zip |
*** empty log message ***
3 files changed, 17 insertions, 21 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java index cb9c106117..55598d3a17 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.ui; -import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.protocol.CDOID; +import org.eclipse.emf.internal.cdo.InternalCDOObject; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.jface.viewers.TreeViewer; @@ -69,11 +69,11 @@ public abstract class ItemsProcessor } } - protected CDOObject getCDOObject(Object object) + protected InternalCDOObject getCDOObject(Object object) { - if (object instanceof CDOObject) + if (object instanceof InternalCDOObject) { - return (CDOObject)object; + return (InternalCDOObject)object; } if (object != null && view != null) @@ -84,7 +84,7 @@ public abstract class ItemsProcessor return null; } - protected abstract void processCDOObject(TreeViewer viewer, CDOObject cdoObject); + protected abstract void processCDOObject(TreeViewer viewer, InternalCDOObject cdoObject); private void processItems(TreeViewer viewer, Set<CDOID> ids, TreeItem[] items) { @@ -101,7 +101,7 @@ public abstract class ItemsProcessor private void processObject(TreeViewer viewer, Set<CDOID> ids, Object object) { - CDOObject cdoObject = getCDOObject(object); + InternalCDOObject cdoObject = getCDOObject(object); if (cdoObject != null) { if (ids == null) diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java index b3d889ed0e..a9f549a370 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java @@ -56,8 +56,7 @@ import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider; import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper; import org.eclipse.emf.edit.ui.util.EditUIUtil; import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage; -import org.eclipse.emf.internal.cdo.CDOAdapterImpl; -import org.eclipse.emf.internal.cdo.CDOCallbackImpl; +import org.eclipse.emf.internal.cdo.CDOLegacyImpl; import org.eclipse.emf.internal.cdo.CDOStateMachine; import org.eclipse.emf.internal.cdo.InternalCDOObject; @@ -1222,15 +1221,11 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv eventHandler = new CDOEventHandler(view, selectionViewer) { @Override - protected void objectInvalidated(CDOObject cdoObject) + protected void objectInvalidated(InternalCDOObject cdoObject) { - if (cdoObject instanceof CDOCallbackImpl) + if (cdoObject instanceof CDOLegacyImpl) { - // Do nothing - } - else if (cdoObject instanceof CDOAdapterImpl) - { - CDOStateMachine.INSTANCE.read((InternalCDOObject)cdoObject); + CDOStateMachine.INSTANCE.read(cdoObject); } } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java index 8746f55cd7..d50701dbda 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.ui.views; -import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.cdo.CDOSessionInvalidationEvent; import org.eclipse.emf.cdo.CDOSessionViewsEvent; import org.eclipse.emf.cdo.CDOTransactionCommittedEvent; @@ -24,6 +23,8 @@ import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.ILifecycleEvent; +import org.eclipse.emf.internal.cdo.InternalCDOObject; + import org.eclipse.jface.viewers.TreeViewer; import java.util.HashSet; @@ -81,9 +82,9 @@ public class CDOEventHandler new ItemsProcessor(view) { @Override - protected void processCDOObject(TreeViewer viewer, CDOObject cdoObject) + protected void processCDOObject(TreeViewer viewer, InternalCDOObject cdoObject) { - viewer.update(cdoObject, null); + viewer.update(cdoObject.cdoInternalInstance(), null); } }.processCDOObjects(treeViewer, newOIDs); @@ -132,15 +133,15 @@ public class CDOEventHandler new ItemsProcessor(view) { @Override - protected void processCDOObject(TreeViewer viewer, CDOObject cdoObject) + protected void processCDOObject(TreeViewer viewer, InternalCDOObject cdoObject) { objectInvalidated(cdoObject); - viewer.refresh(cdoObject, true); + viewer.refresh(cdoObject.cdoInternalInstance(), true); } }.processCDOObjects(treeViewer, dirtyOIDs); } - protected void objectInvalidated(CDOObject cdoObject) + protected void objectInvalidated(InternalCDOObject cdoObject) { } |