diff options
| author | Eike Stepper | 2011-01-03 13:14:00 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-01-03 13:14:00 +0000 |
| commit | 2b5d9e2fe0bc667d6e4df8c625a04c1d65e0d868 (patch) | |
| tree | 32002c2830c7edb62cff5f6199c91abfa96cd39c /plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java | |
| parent | 2212f84571a0d789de51bd4d3878da56ed5f2839 (diff) | |
| download | cdo-2b5d9e2fe0bc667d6e4df8c625a04c1d65e0d868.tar.gz cdo-2b5d9e2fe0bc667d6e4df8c625a04c1d65e0d868.tar.xz cdo-2b5d9e2fe0bc667d6e4df8c625a04c1d65e0d868.zip | |
cleanup
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java index a71346d4af..c377bb4c30 100644 --- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java +++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java @@ -24,7 +24,6 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionHandler; import org.eclipse.emf.cdo.common.revision.CDORevisionManager; import org.eclipse.emf.cdo.common.revision.CDORevisionProvider; import org.eclipse.emf.cdo.common.revision.CDORevisionUtil; -import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDeltaUtil; import org.eclipse.emf.cdo.internal.server.Repository; import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.server.CDOServerBrowser; @@ -281,8 +280,8 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace CDOChangeSetData localData = getLocalChanges(); if (!localData.isEmpty()) { - CDOChangeSet localChanges = CDORevisionDeltaUtil.createChangeSet(basePoint, null, localData); - CDOChangeSet remoteChanges = CDORevisionDeltaUtil.createChangeSet(basePoint, remotePoint, remoteData); + CDOChangeSet localChanges = CDORevisionUtil.createChangeSet(basePoint, null, localData); + CDOChangeSet remoteChanges = CDORevisionUtil.createChangeSet(basePoint, remotePoint, remoteData); remoteData = merger.merge(localChanges, remoteChanges); } @@ -503,7 +502,7 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace public CDOChangeSetData getLocalChanges() { Set<CDOID> ids = base.getIDs(); - return CDORevisionDeltaUtil.createChangeSetData(ids, base, this); + return CDORevisionUtil.createChangeSetData(ids, base, this); } protected IManagedContainer createContainer(IStore local) |