Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo')
-rw-r--r--plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF52
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java26
2 files changed, 49 insertions, 29 deletions
diff --git a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
index 357c90d91f..be8cc10765 100644
--- a/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo; singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.4.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,29 +10,29 @@ Bundle-Activator: org.eclipse.emf.internal.cdo.bundle.Activator$Implementation
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
org.eclipse.emf.cdo.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo;version="4.4.0",
- org.eclipse.emf.cdo.eresource;version="4.4.0",
- org.eclipse.emf.cdo.eresource.impl;version="4.4.0",
- org.eclipse.emf.cdo.eresource.util;version="4.4.0",
- org.eclipse.emf.cdo.eresource.validation;version="4.4.0",
- org.eclipse.emf.cdo.etypes;version="4.4.0",
- org.eclipse.emf.cdo.etypes.impl;version="4.4.0",
- org.eclipse.emf.cdo.etypes.util;version="4.4.0",
- org.eclipse.emf.cdo.session;version="4.4.0",
- org.eclipse.emf.cdo.session.remote;version="4.4.0",
- org.eclipse.emf.cdo.transaction;version="4.4.0",
- org.eclipse.emf.cdo.util;version="4.4.0",
- org.eclipse.emf.cdo.view;version="4.4.0",
- org.eclipse.emf.internal.cdo;version="4.4.0",
- org.eclipse.emf.internal.cdo.analyzer;version="4.4.0";
+Export-Package: org.eclipse.emf.cdo;version="4.4.100",
+ org.eclipse.emf.cdo.eresource;version="4.4.100",
+ org.eclipse.emf.cdo.eresource.impl;version="4.4.100",
+ org.eclipse.emf.cdo.eresource.util;version="4.4.100",
+ org.eclipse.emf.cdo.eresource.validation;version="4.4.100",
+ org.eclipse.emf.cdo.etypes;version="4.4.100",
+ org.eclipse.emf.cdo.etypes.impl;version="4.4.100",
+ org.eclipse.emf.cdo.etypes.util;version="4.4.100",
+ org.eclipse.emf.cdo.session;version="4.4.100",
+ org.eclipse.emf.cdo.session.remote;version="4.4.100",
+ org.eclipse.emf.cdo.transaction;version="4.4.100",
+ org.eclipse.emf.cdo.util;version="4.4.100",
+ org.eclipse.emf.cdo.view;version="4.4.100",
+ org.eclipse.emf.internal.cdo;version="4.4.100",
+ org.eclipse.emf.internal.cdo.analyzer;version="4.4.100";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.defs,
org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.bundle;version="4.4.0";x-friends:="org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.messages;version="4.4.0";x-internal:=true,
- org.eclipse.emf.internal.cdo.object;version="4.4.0";
+ org.eclipse.emf.internal.cdo.bundle;version="4.4.100";x-friends:="org.eclipse.emf.cdo.ui",
+ org.eclipse.emf.internal.cdo.messages;version="4.4.100";x-internal:=true,
+ org.eclipse.emf.internal.cdo.object;version="4.4.100";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.tests,
@@ -42,14 +42,14 @@ Export-Package: org.eclipse.emf.cdo;version="4.4.0",
org.eclipse.emf.cdo.explorer,
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.edit",
- org.eclipse.emf.internal.cdo.query;version="4.4.0";
+ org.eclipse.emf.internal.cdo.query;version="4.4.100";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.defs,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests.objectivity",
- org.eclipse.emf.internal.cdo.session;version="4.4.0";
+ org.eclipse.emf.internal.cdo.session;version="4.4.100";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.tests,
@@ -60,25 +60,25 @@ Export-Package: org.eclipse.emf.cdo;version="4.4.0",
org.eclipse.emf.cdo.security.ui,
org.eclipse.emf.cdo.explorer,
org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.internal.cdo.session.remote;version="4.4.0";
+ org.eclipse.emf.internal.cdo.session.remote;version="4.4.100";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.defs,
org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.transaction;version="4.4.0";
+ org.eclipse.emf.internal.cdo.transaction;version="4.4.100";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.defs,
org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.util;version="4.4.0";
+ org.eclipse.emf.internal.cdo.util;version="4.4.100";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.defs,
org.eclipse.emf.cdo.ui",
- org.eclipse.emf.internal.cdo.view;version="4.4.0";
+ org.eclipse.emf.internal.cdo.view;version="4.4.100";
x-friends:="org.eclipse.emf.cdo.net4j,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.tests,
@@ -87,5 +87,5 @@ Export-Package: org.eclipse.emf.cdo;version="4.4.0",
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.explorer,
org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.spi.cdo;version="4.4.0"
+ org.eclipse.emf.spi.cdo;version="4.4.100"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index 6f512fa4dc..03c2c13af6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -738,6 +738,26 @@ public class CDOViewImpl extends AbstractCDOView
return revisionManager.getRevision(id, branchPoint, initialChunkSize, CDORevision.DEPTH_NONE, loadOnDemand);
}
+ @Override
+ public synchronized void remapObject(CDOID oldID)
+ {
+ InternalCDOObject object = getObject(oldID, false);
+ InternalCDOLockState oldLockState = (InternalCDOLockState)lockStates.get(object);
+ if (oldLockState != null)
+ {
+ oldLockState.updateFrom(getLockTarget(object), oldLockState);
+ }
+ super.remapObject(oldID);
+ }
+
+ @Override
+ public synchronized InternalCDOObject removeObject(CDOID id)
+ {
+ InternalCDOObject removedObject = super.removeObject(id);
+ removeLockState(removedObject);
+ return removedObject;
+ }
+
public synchronized CDOLockState[] getLockStates(Collection<CDOID> ids)
{
return getLockStates(ids, true);
@@ -814,11 +834,11 @@ public class CDOViewImpl extends AbstractCDOView
{
updateLockStates(newLockStateForCache.toArray(new CDOLockState[newLockStateForCache.size()]));
}
-
- CDOLockState[] locksOnNewObjectsArray = locksOnNewObjects.toArray(new CDOLockState[locksOnNewObjects.size()]);
- updateLockStates(locksOnNewObjectsArray);
}
+ CDOLockState[] locksOnNewObjectsArray = locksOnNewObjects.toArray(new CDOLockState[locksOnNewObjects.size()]);
+ updateLockStates(locksOnNewObjectsArray);
+
return lockStates.toArray(new CDOLockState[lockStates.size()]);
}

Back to the top