Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-03-19 01:31:41 -0400
committerEike Stepper2013-03-19 01:31:41 -0400
commit22dafda78715fb4c007a0fe0f0da1eebf68cdcb8 (patch)
treea937897738b64a164901aa553903ff2578b128ef
parentb2ce98845faf1b5cdb98aa30df6ae06241519c67 (diff)
downloadcdo-22dafda78715fb4c007a0fe0f0da1eebf68cdcb8.tar.gz
cdo-22dafda78715fb4c007a0fe0f0da1eebf68cdcb8.tar.xz
cdo-22dafda78715fb4c007a0fe0f0da1eebf68cdcb8.zip
[402371] CDOCompareUtil.compare fails with models that use Containment
Proxies https://bugs.eclipse.org/bugs/show_bug.cgi?id=402371
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/build.rmap2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF2
4 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
index 889ba9c08f..684e6cd3b1 100644
--- a/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.compare/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=r
Export-Package: org.eclipse.emf.cdo.compare;version="4.2.0",
org.eclipse.emf.cdo.internal.compare.bundle;version="4.2.0";x-friends:="org.eclipse.emf.cdo.tests"
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base;version="[10.0.0,11.0.0)",
- com.google.common.cache;version="[10.0.1,11.0.0)",
- com.google.common.collect;version="[10.0.0,11.0.0)",
- com.google.common.util.concurrent;version="[10.0.1,11.0.0)"
+Import-Package: com.google.common.base;version="[11.0.0,15.0.0)",
+ com.google.common.cache;version="[11.0.0,15.0.0)",
+ com.google.common.collect;version="[11.0.0,15.0.0)",
+ com.google.common.util.concurrent;version="[11.0.0,15.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
index 5441b55a0d..614b0f9608 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.compare.EMFCompare.Builder;
import org.eclipse.emf.compare.conflict.IConflictDetector;
import org.eclipse.emf.compare.diff.IDiffEngine;
import org.eclipse.emf.compare.equi.IEquiEngine;
-import org.eclipse.emf.compare.extension.PostProcessorRegistry;
import org.eclipse.emf.compare.match.DefaultComparisonFactory;
import org.eclipse.emf.compare.match.DefaultEqualityHelperFactory;
import org.eclipse.emf.compare.match.DefaultMatchEngine;
@@ -34,6 +33,7 @@ import org.eclipse.emf.compare.match.IEqualityHelperFactory;
import org.eclipse.emf.compare.match.IMatchEngine;
import org.eclipse.emf.compare.match.eobject.IEObjectMatcher;
import org.eclipse.emf.compare.match.eobject.IdentifierEObjectMatcher;
+import org.eclipse.emf.compare.postprocessor.IPostProcessor;
import org.eclipse.emf.compare.req.IReqEngine;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.ecore.EObject;
@@ -106,7 +106,7 @@ public class CDOCompare
builder.setEquivalenceEngine(equiEngine);
}
- PostProcessorRegistry registry = createPostProcessorRegistry();
+ IPostProcessor.Descriptor.Registry<?> registry = createPostProcessorRegistry();
if (registry != null)
{
builder.setPostProcessorRegistry(registry);
@@ -141,7 +141,7 @@ public class CDOCompare
return null;
}
- protected PostProcessorRegistry createPostProcessorRegistry()
+ protected IPostProcessor.Descriptor.Registry<?> createPostProcessorRegistry()
{
return null;
}
diff --git a/plugins/org.eclipse.emf.cdo.releng/build.rmap b/plugins/org.eclipse.emf.cdo.releng/build.rmap
index 7a74ff7f18..8af488a605 100644
--- a/plugins/org.eclipse.emf.cdo.releng/build.rmap
+++ b/plugins/org.eclipse.emf.cdo.releng/build.rmap
@@ -48,7 +48,7 @@
<!-- EMF -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
- <rm:uri format="https://hudson.eclipse.org/hudson/job/emf-core-head/384/artifact/EMF.p2.repository">
+ <rm:uri format="http://download.eclipse.org/modeling/emf/emf/updates/{0}">
<bc:propertyRef key="emf.version"/>
</rm:uri>
</rm:provider>
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
index 21fc25a917..9ba2fe2e9b 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.cdo.ui;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.compare;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.compare.ide.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.compare.ide.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.emf.compare.edit;bundle-version="[3.0.0,4.0.0)"
Export-Package: org.eclipse.emf.cdo.ui.compare;version="4.2.0",
org.eclipse.emf.cdo.ui.internal.compare;version="4.2.0";x-internal:=true,

Back to the top