diff options
| author | Laurent Goubet | 2014-01-30 10:18:27 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2014-01-30 15:43:15 +0000 |
| commit | 578f5e206473a3a4286246648b969282bf0a1029 (patch) | |
| tree | c42e21f7d395e3b90c56264e234424ad19c26d20 /plugins | |
| parent | f6f92566be706f641c0afade7e3ab3dd752927cd (diff) | |
| download | org.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.tar.gz org.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.tar.xz org.eclipse.emf.compare-578f5e206473a3a4286246648b969282bf0a1029.zip | |
Cleanup for version bumping
- Bump versions to reflect minimal BREE change
- Fix as many warnings as possible
- Make sure our @since reflect the correct versions
Change-Id: Ifb30b655f17ef2420ea5ca69c528910bd51e7649
Diffstat (limited to 'plugins')
205 files changed, 2402 insertions, 1945 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/META-INF/MANIFEST.MF index f8fc2d0bd..2832f02f9 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.diagram.ecoretools.tests -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Export-Package: org.eclipse.emf.compare.diagram.ecoretools.tests, org.eclipse.emf.compare.diagram.ecoretools.tests.hide Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.5.0", diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml index 721ffd62c..767f349e1 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/pom.xml @@ -5,12 +5,12 @@ <parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.diagram.ecoretools.tests</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.compare.diagram.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.edit/META-INF/MANIFEST.MF index a32e3b2e6..72f3d4f23 100644 --- a/plugins/org.eclipse.emf.compare.diagram.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.diagram.edit;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.compare.diagram.internal.extensions.provider.ExtensionsEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml b/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml index 62039bf59..c7d1f8f3f 100644 --- a/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.edit/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.edit</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/META-INF/MANIFEST.MF index 9e58235ba..69e8136e0 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.diagram.ide.ecoretools.tests -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.8.0", org.junit, diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml index 2e3de2276..b69065335 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/pom.xml @@ -5,12 +5,12 @@ <parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.diagram.ide.ecoretools.tests</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/META-INF/MANIFEST.MF index 50c060fd4..1dedc0403 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.compare.diagram.ide.ui.ecoretools;singleton:=true Bundle-Name: %pluginName Bundle-Vendor: %providerName -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.emf.compare.diagram.ide.ui;bundle-version="3.0.0", org.eclipse.emf.ecoretools.diagram diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml index 2f231c9a6..699886306 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.ide.ui.ecoretools</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/META-INF/MANIFEST.MF index 1a3355c97..a4999c5f7 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.compare.diagram.ide.ui.papyrus;singleton:=true Bundle-Name: %pluginName Bundle-Vendor: %providerName -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.emf.compare.diagram.ide.ui;bundle-version="3.0.0", org.eclipse.gmf.runtime.diagram.ui;bundle-version="0.9.1", diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml index 62d48c6a7..8c6d014fd 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.ide.ui.papyrus</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.ide.ui/META-INF/MANIFEST.MF index 42e7a5e0c..d68c6b1e9 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.diagram.ide.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.diagram.ide.ui.internal.CompareDiagramIDEUIPlugin Require-Bundle: org.eclipse.emf.compare, org.eclipse.gmf.runtime.diagram.ui, diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml index b6638efb5..12a2f98b6 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram.ide.ui</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF index c0feb1c2a..e81a452c9 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.diagram.papyrus.tests -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.junit, org.eclipse.emf.compare.diagram, diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml index b924b4b87..388fc2e4e 100644 --- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/pom.xml @@ -5,12 +5,12 @@ <parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.diagram.papyrus.tests</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.compare.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram/META-INF/MANIFEST.MF index 054f3a47f..ba7e495e0 100644 --- a/plugins/org.eclipse.emf.compare.diagram/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.diagram/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.diagram;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.compare.diagram/pom.xml b/plugins/org.eclipse.emf.compare.diagram/pom.xml index 314fd2af1..e813819eb 100644 --- a/plugins/org.eclipse.emf.compare.diagram/pom.xml +++ b/plugins/org.eclipse.emf.compare.diagram/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.diagram</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF index 9f5ce295d..a6e47ec7e 100644 --- a/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.doc; singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.compare.doc/pom.xml b/plugins/org.eclipse.emf.compare.doc/pom.xml index 45744e455..386d1702e 100644 --- a/plugins/org.eclipse.emf.compare.doc/pom.xml +++ b/plugins/org.eclipse.emf.compare.doc/pom.xml @@ -16,12 +16,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.doc</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF index 335067a86..05bffb2fa 100644 --- a/plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.edit;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.compare.provider.EMFCompareEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.compare.edit/pom.xml b/plugins/org.eclipse.emf.compare.edit/pom.xml index fed0ee92b..3f482ba9d 100644 --- a/plugins/org.eclipse.emf.compare.edit/pom.xml +++ b/plugins/org.eclipse.emf.compare.edit/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.edit</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/CompareItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/CompareItemProviderAdapterFactory.java index 1819dee3e..78db1b4d0 100644 --- a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/CompareItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/CompareItemProviderAdapterFactory.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,9 +16,7 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.compare.util.CompareAdapterFactory;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -35,18 +33,17 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the factory that is used to provide the interfaces needed to support Viewers. The adapters
+ * generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged
+ * fireNotifyChanged}. The adapters also support Eclipse property sheets. Note that most of the adapters are
+ * shared among multiple instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public class CompareItemProviderAdapterFactory extends CompareAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("hiding")
@@ -54,41 +51,41 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp public static final String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$
/**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
/**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
/**
- * This keeps track of all the item providers created, so that they can be {@link #dispose disposed}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This keeps track of all the item providers created, so that they can be {@link #dispose disposed}. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
+ * @since 4.0
*/
protected Disposable disposable = new Disposable();
/**
- * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected Collection<Object> supportedTypes = new ArrayList<Object>();
/**
- * This constructs an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public CompareItemProviderAdapterFactory() {
@@ -102,9 +99,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.Comparison}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.Comparison}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
@Override
@@ -113,9 +110,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.MatchResource}.
- * <!-- begin-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.MatchResource}. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -124,9 +121,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.Match}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.Match}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
@Override
@@ -135,9 +132,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.Diff}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.Diff}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
@Override
@@ -146,9 +143,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.ResourceAttachmentChange}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.ResourceAttachmentChange}. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -157,9 +154,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.ReferenceChange}.
- * <!-- begin-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.ReferenceChange}. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -168,9 +165,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.AttributeChange}.
- * <!-- begin-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.AttributeChange}. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -179,9 +176,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.Conflict}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.Conflict}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
@Override
@@ -190,9 +187,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.Equivalence}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.emf.compare.Equivalence}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
@Override
@@ -201,9 +198,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This returns the root adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -211,9 +208,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This sets the composed adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -221,8 +218,8 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -231,9 +228,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This implementation substitutes the factory itself as the key for the adapter.
- * <!-- begin-user-doc -->
+ * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -242,8 +239,8 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -259,9 +256,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * Associates an adapter with a notifier via the base implementation, then records it to ensure it will be disposed.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Associates an adapter with a notifier via the base implementation, then records it to ensure it will be
+ * disposed. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -273,9 +270,8 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This adds a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -283,9 +279,8 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This removes a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -293,9 +288,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- * <!-- begin-user-doc -->
+ * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public void fireNotifyChanged(Notification notification) {
@@ -307,9 +302,9 @@ public class CompareItemProviderAdapterFactory extends CompareAdapterFactory imp }
/**
- * This disposes all of the item providers created by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
public void dispose() {
diff --git a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ComparisonItemProvider.java b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ComparisonItemProvider.java index c68574042..4939a1c13 100644 --- a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ComparisonItemProvider.java +++ b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ComparisonItemProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -44,6 +44,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification; public class ComparisonItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public static final String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$ @@ -98,6 +99,7 @@ public class ComparisonItemProvider extends ItemProviderAdapter implements IEdit * --> * * @generated + * @since 4.0 */ protected void addDiagnosticPropertyDescriptor(Object object) { itemPropertyDescriptors @@ -112,11 +114,11 @@ public class ComparisonItemProvider extends ItemProviderAdapter implements IEdit } /** - * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. - * <!-- begin-user-doc --> + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for + * an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} + * or {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ @Override @@ -133,6 +135,7 @@ public class ComparisonItemProvider extends ItemProviderAdapter implements IEdit /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -144,8 +147,8 @@ public class ComparisonItemProvider extends ItemProviderAdapter implements IEdit } /** - * This returns Comparison.gif. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This returns Comparison.gif. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -154,8 +157,8 @@ public class ComparisonItemProvider extends ItemProviderAdapter implements IEdit } /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -165,10 +168,10 @@ public class ComparisonItemProvider extends ItemProviderAdapter implements IEdit } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * <!-- begin-user-doc + * This handles model notifications by calling {@link #updateChildren} to update any cached children and + * by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ @Override @@ -193,9 +196,9 @@ public class ComparisonItemProvider extends ItemProviderAdapter implements IEdit } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be + * created under this object. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -216,9 +219,9 @@ public class ComparisonItemProvider extends ItemProviderAdapter implements IEdit } /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> <!-- + * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/DiffItemProvider.java b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/DiffItemProvider.java index 20a72334f..d6c9dce8a 100644 --- a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/DiffItemProvider.java +++ b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/DiffItemProvider.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,13 +15,10 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.compare.ComparePackage;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -36,25 +33,25 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.Diff} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.Diff} object. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("all")
// generated code : suppressing warnings
public class DiffItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public static final String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$
/**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
public DiffItemProvider(AdapterFactory adapterFactory) {
@@ -62,9 +59,9 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
@Override
@@ -89,9 +86,8 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Requires feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Requires feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addRequiresPropertyDescriptor(Object object) {
@@ -106,9 +102,9 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Required By feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Required By feature. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
protected void addRequiredByPropertyDescriptor(Object object) {
@@ -123,10 +119,10 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Implies feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Implies feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
+ * @since 4.0
*/
protected void addImpliesPropertyDescriptor(Object object) {
itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
@@ -136,10 +132,11 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Implied By feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Implied By feature. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
+ * @since 4.0
*/
protected void addImpliedByPropertyDescriptor(Object object) {
itemPropertyDescriptors
@@ -153,9 +150,8 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Refines feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Refines feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addRefinesPropertyDescriptor(Object object) {
@@ -166,9 +162,9 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Refined By feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Refined By feature. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
protected void addRefinedByPropertyDescriptor(Object object) {
@@ -183,10 +179,11 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Prime Refining feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Prime Refining feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
+ * @since 4.0
*/
protected void addPrimeRefiningPropertyDescriptor(Object object) {
itemPropertyDescriptors
@@ -200,9 +197,8 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Kind feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Kind feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addKindPropertyDescriptor(Object object) {
@@ -215,9 +211,8 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Source feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Source feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addSourcePropertyDescriptor(Object object) {
@@ -230,9 +225,8 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the State feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the State feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addStatePropertyDescriptor(Object object) {
@@ -245,9 +239,9 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Equivalence feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Equivalence feature. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
* @generated
*/
protected void addEquivalencePropertyDescriptor(Object object) {
@@ -262,9 +256,8 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds a property descriptor for the Conflict feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds a property descriptor for the Conflict feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected void addConflictPropertyDescriptor(Object object) {
@@ -279,9 +272,8 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This returns Diff.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns Diff.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -290,9 +282,8 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -304,10 +295,10 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This handles model notifications by calling {@link #updateChildren} to update any cached children and
+ * by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -326,10 +317,9 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be
+ * created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -338,9 +328,9 @@ public class DiffItemProvider extends ItemProviderAdapter implements IEditingDom }
/**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/DelegatingCommandStack.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/DelegatingCommandStack.java index 81bf6dc94..02135b2d4 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/DelegatingCommandStack.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/DelegatingCommandStack.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.command.CommandStackListener; * {@link CommandStack}.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
+ * @since 4.0
*/
// CHECKSTYLE:OFF
public abstract class DelegatingCommandStack implements CommandStack {
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/impl/MergeCommand.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/impl/MergeCommand.java index b77e05715..cfed3f80e 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/impl/MergeCommand.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/command/impl/MergeCommand.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.change.util.ChangeRecorder; * {@link IMergeRunnable#merge(List, boolean, IMerger.Registry)} method.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
+ * @since 4.0
*/
public class MergeCommand extends AbstractCopyCommand {
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/IMergeRunnable.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/IMergeRunnable.java index fe2213660..b09d08c2f 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/IMergeRunnable.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/IMergeRunnable.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,6 +19,7 @@ import org.eclipse.emf.compare.merge.IMerger.Registry; * Interface for executing merge commands from the {@link ICompareEditingDomain}.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
+ * @since 4.0
*/
public interface IMergeRunnable {
@@ -35,4 +36,4 @@ public interface IMergeRunnable { */
void merge(List<? extends Diff> differences, boolean leftToRight, Registry mergerRegistry);
-}
\ No newline at end of file +}
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java index d262cefee..846c28bdc 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,15 +20,17 @@ import org.eclipse.emf.common.command.BasicCommandStack; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CommandStack; import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.common.util.BasicMonitor; import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.command.ICompareCommandStack; import org.eclipse.emf.compare.command.ICompareCopyCommand; import org.eclipse.emf.compare.command.impl.CompareCommandStack; -import org.eclipse.emf.compare.command.impl.CopyCommand; import org.eclipse.emf.compare.command.impl.DualCompareCommandStack; import org.eclipse.emf.compare.command.impl.MergeCommand; import org.eclipse.emf.compare.domain.ICompareEditingDomain; import org.eclipse.emf.compare.domain.IMergeRunnable; +import org.eclipse.emf.compare.merge.BatchMerger; +import org.eclipse.emf.compare.merge.IBatchMerger; import org.eclipse.emf.compare.merge.IMerger; import org.eclipse.emf.compare.merge.IMerger.Registry; import org.eclipse.emf.ecore.EObject; @@ -266,7 +268,18 @@ public class EMFCompareEditingDomain implements ICompareEditingDomain { } ImmutableSet<Notifier> notifiers = notifiersBuilder.addAll(fNotifiers).build(); - return new CopyCommand(fChangeRecorder, notifiers, differences, leftToRight, mergerRegistry); + IMergeRunnable runnable = new IMergeRunnable() { + public void merge(List<? extends Diff> diffs, boolean lTR, Registry registry) { + final IBatchMerger merger = new BatchMerger(registry); + if (lTR) { + merger.copyAllLeftToRight(diffs, new BasicMonitor()); + } else { + merger.copyAllRightToLeft(diffs, new BasicMonitor()); + } + } + }; + return new MergeCommand(fChangeRecorder, notifiers, differences, leftToRight, mergerRegistry, + runnable); } /** diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/internal/edit_messages.properties b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/internal/edit_messages.properties index 826c02f4d..fe7df7a3a 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/internal/edit_messages.properties +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/internal/edit_messages.properties @@ -10,4 +10,30 @@ ################################################################################ ## ! note ! double the apostrophes if you need one in the printed String conflict=Conflict -pseudoconflict=Pseudo Conflict
\ No newline at end of file +pseudoconflict=Pseudo Conflict + +change.local = has been +change.remote = has been remotely + +# In english, this gives a text such as "{value} {has been remotely} added to {attribute}" +AttributeChangeItemProviderSpec.valueAdded = {0} {1} added to {2} +AttributeChangeItemProviderSpec.valueRemoved = {0} {1} deleted from {2} +AttributeChangeItemProviderSpec.valueMoved = {0} {1} moved in {2} +# This one gives, for example : "{attribute} {value} {has been} {set|unset|changed}" +AttributeChangeItemProviderSpec.valueChanged = {0} {1} {2} {3} + +ConflictItemProviderSpec.description = {0} conflict with {1} other difference(s) + +ReferenceChangeItemProviderSpec.set = set +ReferenceChangeItemProviderSpec.unset = unset +ReferenceChangeItemProviderSpec.changed = changed +ReferenceChangeItemProviderSpec.decoration.add = add +ReferenceChangeItemProviderSpec.decoration.delete = delete +ReferenceChangeItemProviderSpec.decoration.move = move + +ResourceAttachmentChangeItemProviderSpec.decoration.control = controlled in +ResourceAttachmentChangeItemProviderSpec.decoration.uncontrol = uncontrolled from +# These render as "{value} {has been remotely} added to resource contents" +ResourceAttachmentChangeItemProviderSpec.added = {0} {1} added to resource contents +ResourceAttachmentChangeItemProviderSpec.deleted = {0} {1} deleted from resource contents +ResourceAttachmentChangeItemProviderSpec.moved = {0} {1} moved in resource contents
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/AdapterFactoryUtil.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/AdapterFactoryUtil.java index 3a28b9358..5a8695128 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/AdapterFactoryUtil.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/AdapterFactoryUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -93,6 +93,7 @@ public final class AdapterFactoryUtil { * @param object * the given object. * @return the StyledText as an Object. + * @since 4.0 */ public static Object getStyledText(AdapterFactory adapterFactory, Object object) { Preconditions.checkNotNull(adapterFactory); diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedAdapterFactoryItemDelegator.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedAdapterFactoryItemDelegator.java index 6df24b346..7f463544b 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedAdapterFactoryItemDelegator.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedAdapterFactoryItemDelegator.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator; * {@link IItemStyledLabelProvider} and {@link IItemDescriptionProvider}.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
+ * @since 4.0
*/
public class ExtendedAdapterFactoryItemDelegator extends AdapterFactoryItemDelegator implements IItemStyledLabelProvider, IItemDescriptionProvider {
@@ -59,7 +60,7 @@ public class ExtendedAdapterFactoryItemDelegator extends AdapterFactoryItemDeleg result = new ComposedStyledString();
for (Object child : (List<?>)object) {
if (!isEmpty(result)) {
- result.append(", ");
+ result.append(", "); //$NON-NLS-1$
}
IComposedStyledString styledText = getStyledText(child);
for (IStyledString styledString : styledText) {
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedItemProviderDecorator.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedItemProviderDecorator.java index 41229473a..856db7d7d 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedItemProviderDecorator.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedItemProviderDecorator.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.eclipse.emf.edit.provider.ItemProviderDecorator; * {@link ExtendedAdapterFactoryItemDelegator}.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
+ * @since 4.0
*/
public class ExtendedItemProviderDecorator extends ItemProviderDecorator implements Adapter.Internal {
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java index 1dce2412f..9797b8a26 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,6 +17,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.compare.AttributeChange; import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.DifferenceSource; +import org.eclipse.emf.compare.internal.EMFCompareEditMessages; import org.eclipse.emf.compare.provider.AttributeChangeItemProvider; import org.eclipse.emf.compare.provider.IItemDescriptionProvider; import org.eclipse.emf.compare.provider.IItemStyledLabelProvider; @@ -127,7 +128,7 @@ public class AttributeChangeItemProviderSpec extends AttributeChangeItemProvider if (isNullOrEmpty(value)) { if (attValue instanceof EObject && ((EObject)attValue).eIsProxy()) { - value = "proxy : " + ((InternalEObject)attValue).eProxyURI().toString(); + value = "proxy : " + ((InternalEObject)attValue).eProxyURI().toString(); //$NON-NLS-1$ } else { value = "<null>"; //$NON-NLS-1$ } @@ -211,32 +212,35 @@ public class AttributeChangeItemProviderSpec extends AttributeChangeItemProvider final String valueText = getValueText(attChange); final String attributeText = getAttributeText(attChange); - String remotely = ""; + String hasBeenAndSide = EMFCompareEditMessages.getString("change.local"); //$NON-NLS-1$ if (attChange.getSource() == DifferenceSource.RIGHT) { - remotely = "remotely "; + hasBeenAndSide = EMFCompareEditMessages.getString("change.remote"); //$NON-NLS-1$ } - String ret = ""; - final String hasBeen = " has been "; + String ret = ""; //$NON-NLS-1$ switch (attChange.getKind()) { case ADD: - ret = valueText + hasBeen + remotely + "added to " + attributeText; + ret = EMFCompareEditMessages.getString("AttributeChangeItemProviderSpec.valueAdded", //$NON-NLS-1$ + valueText, hasBeenAndSide, attributeText); break; case DELETE: - ret = valueText + hasBeen + remotely + "deleted from " + attributeText; + ret = EMFCompareEditMessages.getString("AttributeChangeItemProviderSpec.valueRemoved", //$NON-NLS-1$ + valueText, hasBeenAndSide, attributeText); break; case CHANGE: String changeText = ReferenceChangeItemProviderSpec.changeText(attChange, attChange .getAttribute()); - ret = attributeText + " " + valueText + hasBeen + remotely + changeText; + ret = EMFCompareEditMessages.getString("AttributeChangeItemProviderSpec.valueChanged", //$NON-NLS-1$ + attributeText, valueText, hasBeenAndSide, changeText); break; case MOVE: - ret = valueText + hasBeen + remotely + "moved in '" + attributeText; + ret = EMFCompareEditMessages.getString("AttributeChangeItemProviderSpec.valueMoved", //$NON-NLS-1$ + valueText, hasBeenAndSide, attributeText); break; default: - throw new IllegalStateException("Unsupported " + DifferenceKind.class.getSimpleName() - + " value: " + attChange.getKind()); + throw new IllegalStateException("Unsupported " + DifferenceKind.class.getSimpleName() //$NON-NLS-1$ + + " value: " + attChange.getKind()); //$NON-NLS-1$ } return ret; diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java index 02ffd98e1..cf98da95c 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -97,10 +97,8 @@ public class ConflictItemProviderSpec extends ConflictItemProvider implements II public String getDescription(Object object) { Conflict conflict = (Conflict)object; int size = conflict.getDifferences().size() - 1; - String ret = conflict.getKind().getName() + " conflict with " + size + " other difference"; - if (size > 1) { - ret += "s"; - } + String ret = EMFCompareEditMessages.getString("ConflictItemProviderSpec.description", conflict //$NON-NLS-1$ + .getKind().getName(), Integer.valueOf(size)); return ret; } } diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java index 4f7898213..a44f024e1 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -106,7 +106,6 @@ public class MatchItemProviderSpec extends MatchItemProvider implements IItemSty * @since 3.0 */ public IStyledString.IComposedStyledString getStyledText(Object object) { - Match match = (Match)object; ComposedStyledString styledString = new ComposedStyledString(getText(object)); return styledString; } diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java index 837d4ff7f..38638758f 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -106,9 +106,10 @@ public class OverlayImageProvider { * @param imageToCompose * the image of the match to use as base. * @return a composed image with the image of the given object and the appropriate overlay. + * @since 4.0 */ public Object getComposedImage(Object object, Object imageToCompose) { - String overlay = "full/ovr16/match_ov"; + String overlay = "full/ovr16/match_ov"; //$NON-NLS-1$ return getComposedImage(imageToCompose, overlay); } diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java index 157e492eb..d9400db12 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,6 +21,7 @@ import org.eclipse.emf.compare.DifferenceSource; import org.eclipse.emf.compare.DifferenceState; import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.ReferenceChange; +import org.eclipse.emf.compare.internal.EMFCompareEditMessages; import org.eclipse.emf.compare.provider.IItemDescriptionProvider; import org.eclipse.emf.compare.provider.IItemStyledLabelProvider; import org.eclipse.emf.compare.provider.ReferenceChangeItemProvider; @@ -118,19 +119,19 @@ public class ReferenceChangeItemProviderSpec extends ReferenceChangeItemProvider if (sourceSide != null) { Object leftValue = ReferenceUtil.safeEGet(sourceSide, eStructuralFeature); if (leftValue == null || isStringAndNullOrEmpty(leftValue)) { - changeText = "unset"; + changeText = EMFCompareEditMessages.getString("ReferenceChangeItemProviderSpec.unset"); //$NON-NLS-1$ } else if (otherSide != null) { Object otherValue = ReferenceUtil.safeEGet(otherSide, eStructuralFeature); if (otherValue == null || isStringAndNullOrEmpty(otherValue)) { - changeText = "set"; + changeText = EMFCompareEditMessages.getString("ReferenceChangeItemProviderSpec.set"); //$NON-NLS-1$ } else { - changeText = "changed"; + changeText = EMFCompareEditMessages.getString("ReferenceChangeItemProviderSpec.changed"); //$NON-NLS-1$ } } else { - changeText = "set"; + changeText = EMFCompareEditMessages.getString("ReferenceChangeItemProviderSpec.set"); //$NON-NLS-1$ } } else { - changeText = "unset"; + changeText = EMFCompareEditMessages.getString("ReferenceChangeItemProviderSpec.unset"); //$NON-NLS-1$ } return changeText; } @@ -173,7 +174,7 @@ public class ReferenceChangeItemProviderSpec extends ReferenceChangeItemProvider String value = itemDelegator.getText(refChangeValue); if (isNullOrEmpty(value)) { if (refChangeValue.eIsProxy()) { - value = "proxy : " + ((InternalEObject)refChangeValue).eProxyURI().toString(); + value = "proxy : " + ((InternalEObject)refChangeValue).eProxyURI().toString(); //$NON-NLS-1$ } else { value = "<null>"; //$NON-NLS-1$ } @@ -253,20 +254,26 @@ public class ReferenceChangeItemProviderSpec extends ReferenceChangeItemProvider switch (refChange.getKind()) { case ADD: - ret.append(" add", Style.DECORATIONS_STYLER); + ret.append(' ' + EMFCompareEditMessages + .getString("ReferenceChangeItemProviderSpec.decoration.add"), //$NON-NLS-1$ + Style.DECORATIONS_STYLER); break; case DELETE: - ret.append(" delete", Style.DECORATIONS_STYLER); + ret.append(' ' + EMFCompareEditMessages + .getString("ReferenceChangeItemProviderSpec.decoration.delete"), //$NON-NLS-1$ + Style.DECORATIONS_STYLER); break; case CHANGE: - ret.append(" " + changeText(refChange, refChange.getReference()), Style.DECORATIONS_STYLER); + ret.append(' ' + changeText(refChange, refChange.getReference()), Style.DECORATIONS_STYLER); break; case MOVE: - ret.append(" move", Style.DECORATIONS_STYLER); + ret.append(' ' + EMFCompareEditMessages + .getString("ReferenceChangeItemProviderSpec.decoration.move"), //$NON-NLS-1$ + Style.DECORATIONS_STYLER); break; default: - throw new IllegalStateException("Unsupported " + DifferenceKind.class.getSimpleName() - + " value: " + refChange.getKind()); + throw new IllegalStateException("Unsupported " + DifferenceKind.class.getSimpleName() //$NON-NLS-1$ + + " value: " + refChange.getKind()); //$NON-NLS-1$ } ret.append("]", Style.DECORATIONS_STYLER); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java index 7f0b86b09..0480d0ee2 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,6 +17,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.DifferenceSource; import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.ResourceAttachmentChange; +import org.eclipse.emf.compare.internal.EMFCompareEditMessages; import org.eclipse.emf.compare.provider.IItemDescriptionProvider; import org.eclipse.emf.compare.provider.IItemStyledLabelProvider; import org.eclipse.emf.compare.provider.ResourceAttachmentChangeItemProvider; @@ -110,10 +111,14 @@ public class ResourceAttachmentChangeItemProviderSpec extends ResourceAttachment ret.append(" [", Style.DECORATIONS_STYLER); //$NON-NLS-1$ switch (resourceAttachmentChange.getKind()) { case ADD: - ret.append("controlled in ", Style.DECORATIONS_STYLER); + ret.append(EMFCompareEditMessages + .getString("ResourceAttachmentChangeItemProviderSpec.decoration.control") + ' ', //$NON-NLS-1$ + Style.DECORATIONS_STYLER); break; case DELETE: - ret.append("uncontrolled from ", Style.DECORATIONS_STYLER); + ret.append(EMFCompareEditMessages + .getString("ResourceAttachmentChangeItemProviderSpec.decoration.uncontrol") + ' ', //$NON-NLS-1$ + Style.DECORATIONS_STYLER); break; default: break; @@ -131,38 +136,41 @@ public class ResourceAttachmentChangeItemProviderSpec extends ResourceAttachment public String getDescription(Object object) { final ResourceAttachmentChange rac = (ResourceAttachmentChange)object; final Match match = rac.getMatch(); - String ret = itemDelegator.getText(match.getLeft()); - if (isNullOrEmpty(ret)) { - ret = itemDelegator.getText(match.getRight()); + String valueText = itemDelegator.getText(match.getLeft()); + if (isNullOrEmpty(valueText)) { + valueText = itemDelegator.getText(match.getRight()); } - if (isNullOrEmpty(ret)) { - ret = itemDelegator.getText(match.getOrigin()); + if (isNullOrEmpty(valueText)) { + valueText = itemDelegator.getText(match.getOrigin()); } - if (isNullOrEmpty(ret)) { - ret = super.getText(object); + if (isNullOrEmpty(valueText)) { + valueText = super.getText(object); } - String remotely = ""; + String hasBeenAndSide = EMFCompareEditMessages.getString("change.local"); //$NON-NLS-1$ if (rac.getSource() == DifferenceSource.RIGHT) { - remotely = "remotely "; + hasBeenAndSide = EMFCompareEditMessages.getString("change.remote"); //$NON-NLS-1$ } DifferenceKind labelValue = rac.getKind(); - final String hasBeen = " has been "; + final String ret; switch (labelValue) { case ADD: - ret += hasBeen + remotely + "added to resource contents"; + ret = EMFCompareEditMessages.getString("ResourceAttachmentChangeItemProviderSpec.added", //$NON-NLS-1$ + valueText, hasBeenAndSide); break; case DELETE: - ret += hasBeen + remotely + "deleted from resource contents"; + ret = EMFCompareEditMessages.getString("ResourceAttachmentChangeItemProviderSpec.deleted", //$NON-NLS-1$ + valueText, hasBeenAndSide); break; case MOVE: - ret += hasBeen + remotely + "moved in resource contents"; + ret = EMFCompareEditMessages.getString("ResourceAttachmentChangeItemProviderSpec.moved", //$NON-NLS-1$ + valueText, hasBeenAndSide); break; default: - throw new IllegalStateException("Unsupported " + DifferenceKind.class.getSimpleName() - + " value: " + rac.getKind()); + throw new IllegalStateException("Unsupported " + DifferenceKind.class.getSimpleName() //$NON-NLS-1$ + + " value: " + rac.getKind()); //$NON-NLS-1$ } return ret; } diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/ComposedStyledString.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/ComposedStyledString.java index 5e24ef447..3fd33e513 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/ComposedStyledString.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/ComposedStyledString.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -94,6 +94,7 @@ public class ComposedStyledString implements IComposedStyledString { * {@inheritDoc}
*
* @see org.eclipse.emf.compare.provider.utils.IStyledString.IComposedStyledString#append(org.eclipse.emf.compare.provider.utils.IStyledString.IComposedStyledString)
+ * @since 4.0
*/
public IComposedStyledString append(IComposedStyledString composedStyledString) {
for (IStyledString styledString : composedStyledString) {
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/IStyledString.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/IStyledString.java index fb21ee37a..e946d60da 100644 --- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/IStyledString.java +++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/IStyledString.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -66,6 +66,7 @@ public interface IStyledString { * @param composedStyledString
* the styled string to append.
* @return this instance.
+ * @since 4.0
*/
IComposedStyledString append(IComposedStyledString composedStyledString);
diff --git a/plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF index 97d5cabcc..806a4462e 100644 --- a/plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.ide.tests -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.ide.tests.Activator Require-Bundle: org.eclipse.core.runtime, org.junit;bundle-version="4.8.1", diff --git a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml index 241eb57b6..77e765d75 100644 --- a/plugins/org.eclipse.emf.compare.ide.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.tests/pom.xml @@ -5,12 +5,12 @@ <parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.ide.tests</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF index 3b01c6c83..f0a797717 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.ide.ui.tests;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml index c754820e0..a80f8df9d 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/pom.xml @@ -5,12 +5,12 @@ <parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.ide.ui.tests</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java index 995fc7ca5..dcbf2d795 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (C) 2013 Obeo and others
+ * Copyright (C) 2013, 2014 Obeo and others
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -28,6 +28,7 @@ import org.junit.BeforeClass; /**
* The set up and tear down of this class were mostly copied from org.eclipse.egit.core.test.GitTestCase.
*/
+@SuppressWarnings("restriction")
public class CompareGitTestCase extends CompareTestCase {
protected GitTestRepository repository;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java index acb32f05d..3c227e674 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (C) 2013 Obeo and others
+ * Copyright (C) 2013, 2014 Obeo and others
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -49,7 +49,7 @@ import org.eclipse.team.core.subscribers.SubscriberScopeManager; * This class is largely inspired from org.eclipse.egit.core.test.TestRepository. It has been copied here in
* order to be usable from our build without dependencies towards egit.core.tests.
*/
-@SuppressWarnings("nls")
+@SuppressWarnings({"nls", "restriction" })
public class GitTestRepository {
Repository repository;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/.settings/.api_filters b/plugins/org.eclipse.emf.compare.ide.ui/.settings/.api_filters new file mode 100644 index 000000000..dfdd15da0 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.ide.ui/.settings/.api_filters @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.emf.compare.ide.ui" version="2"> + <resource path="src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java" type="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.table.TableContentMergeViewer"> + <filter id="571519004"> + <message_arguments> + <message_argument value="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.table.TableContentMergeViewer.createMergeViewer(Composite, IMergeViewerMergeViewerSide)"/> + <message_argument value="ArrayContentProvider"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingFile.java" type="org.eclipse.emf.compare.ide.ui.internal.logical.ForwardingFile"> + <filter id="574619656"> + <message_arguments> + <message_argument value="IFile"/> + <message_argument value="ForwardingFile"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingResource.java" type="org.eclipse.emf.compare.ide.ui.internal.logical.ForwardingResource"> + <filter id="574619656"> + <message_arguments> + <message_argument value="IResource"/> + <message_argument value="ForwardingResource"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java" type="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.WrappableTreeViewer"> + <filter id="571473929"> + <message_arguments> + <message_argument value="TreeViewer"/> + <message_argument value="WrappableTreeViewer"/> + </message_arguments> + </filter> + </resource> +</component> diff --git a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF index 3e470fe11..819d11c84 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.ide.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, @@ -37,7 +37,7 @@ Export-Package: org.eclipse.emf.compare.ide.ui.internal;x-internal:=true, org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions;x-internal:=true, org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;x-internal:=true, org.eclipse.emf.compare.ide.ui.internal.util;x-internal:=true, - org.eclipse.emf.compare.ide.ui.logical;x-internal:=true + org.eclipse.emf.compare.ide.ui.logical Import-Package: com.google.common.annotations;version="[11.0.0,15.0.0)", com.google.common.base;version="[11.0.0,15.0.0)", com.google.common.cache;version="[11.0.0,15.0.0)", diff --git a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml index eb5b3ab64..7dd893b6b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.ide.ui</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java index 56abb297c..10e6d85e2 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -93,7 +93,7 @@ import org.eclipse.ui.views.properties.PropertySheet; */ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer implements ISelectionChangedListener, ICompareColor.Provider, IAdaptable, CommandStackListener { - private static final String HANDLER_SERVICE = "fHandlerService"; + private static final String HANDLER_SERVICE = "fHandlerService"; //$NON-NLS-1$ /** * Width of center bar @@ -326,7 +326,7 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im IMenuService menuService = (IMenuService)workbench.getService(IMenuService.class); if (menuService != null) { menuService.populateContributionManager(toolBarManager, - "toolbar:org.eclipse.emf.compare.contentmergeviewer.toolbar"); + "toolbar:org.eclipse.emf.compare.contentmergeviewer.toolbar"); //$NON-NLS-1$ } } @@ -350,6 +350,7 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im */ @Override protected void copy(final boolean leftToRight) { + // TODO this is used from an action we delete from the view, so can probably be removed altogether final List<Diff> differences; if (getCompareConfiguration().getComparison().isThreeWay()) { diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java index 247bd5f10..d5a1eed9c 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -198,13 +198,13 @@ public class TableContentMergeViewer extends EMFCompareContentMergeViewer { IMergeViewerItem mergeViewerItem = (IMergeViewerItem)object; final Object value = mergeViewerItem.getSideValue(side); if (value instanceof EObject && ((EObject)value).eIsProxy()) { - text = "proxy : " + ((InternalEObject)value).eProxyURI().toString(); + text = "proxy : " + ((InternalEObject)value).eProxyURI().toString(); //$NON-NLS-1$ } else if (mergeViewerItem.isInsertionPoint()) { // workaround for 406513: Windows specific issue. Only labels of (Tree/Table)Item are // selectable on Windows platform. The labels of placeholders in (Tree/Table)Viewer // are one whitespace. Placeholder are then selectable at the very left of itself. // Add a 42 whitespaces label to workaround. - text = Strings.repeat(" ", 42); + text = Strings.repeat(" ", 42); //$NON-NLS-1$ } else { text = super.getColumnText(value, columnIndex); } @@ -313,9 +313,9 @@ public class TableContentMergeViewer extends EMFCompareContentMergeViewer { if (iContributionItem instanceof ActionContributionItem) { IAction action = ((ActionContributionItem)iContributionItem).getAction(); String id = action.getActionDefinitionId(); - if ("org.eclipse.compare.copyAllLeftToRight".equals(id)) { + if ("org.eclipse.compare.copyAllLeftToRight".equals(id)) { //$NON-NLS-1$ toolBarManager.remove(iContributionItem); - } else if ("org.eclipse.compare.copyAllRightToLeft".equals(id)) { + } else if ("org.eclipse.compare.copyAllRightToLeft".equals(id)) { //$NON-NLS-1$ toolBarManager.remove(iContributionItem); } } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java index e5d7f5977..222c01c1e 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -191,7 +191,6 @@ public class EMFCompareTextMergeViewer extends TextMergeViewer implements Comman }); } - @SuppressWarnings("resource") // closed by Closeables private String getString(IStreamContentAccessor contentAccessor) { String ret = null; @@ -232,7 +231,7 @@ public class EMFCompareTextMergeViewer extends TextMergeViewer implements Comman protected String getContents(boolean isLeft, String charsetName) { try { - return new String(getContents(isLeft), Charsets.UTF_8.name()); + return new String(getContents(isLeft), charsetName); } catch (UnsupportedEncodingException e) { // UTF_8 is a standard charset guaranteed to be supported by all Java platform // implementations diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java index f34368937..98a2bf535 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -255,20 +255,20 @@ public class TreeContentMergeViewer extends EMFCompareContentMergeViewer { IMergeViewerItem mergeViewerItem = (IMergeViewerItem)object; final Object value = mergeViewerItem.getSideValue(side); if (value instanceof EObject && ((EObject)value).eIsProxy()) { - text = "proxy : " + ((InternalEObject)value).eProxyURI().toString(); + text = "proxy : " + ((InternalEObject)value).eProxyURI().toString(); //$NON-NLS-1$ } else if (mergeViewerItem.isInsertionPoint()) { // workaround for 406513: Windows specific issue. Only labels of (Tree/Table)Item are // selectable on Windows platform. The labels of placeholders in (Tree/Table)Viewer // are one whitespace. Placeholder are then selectable at the very left of itself. // Add a 42 whitespaces label to workaround. - text = " "; + text = " "; //$NON-NLS-1$ } else if (value == null && mergeViewerItem.getSideValue(side.opposite()) instanceof Resource) { - text = "Unknown resource"; + text = getResourceBundle().getString("UnkownResource"); //$NON-NLS-1$ } else if (value == null && mergeViewerItem.getLeft() == null && mergeViewerItem.getRight() == null && mergeViewerItem.getAncestor() instanceof Resource) { - text = "Unknown resource"; + text = getResourceBundle().getString("UnkownResource"); //$NON-NLS-1$ } else { text = super.getText(value); } @@ -379,9 +379,9 @@ public class TreeContentMergeViewer extends EMFCompareContentMergeViewer { if (iContributionItem instanceof ActionContributionItem) { IAction action = ((ActionContributionItem)iContributionItem).getAction(); String id = action.getActionDefinitionId(); - if ("org.eclipse.compare.copyAllLeftToRight".equals(id)) { + if ("org.eclipse.compare.copyAllLeftToRight".equals(id)) { //$NON-NLS-1$ toolBarManager.remove(iContributionItem); - } else if ("org.eclipse.compare.copyAllRightToLeft".equals(id)) { + } else if ("org.eclipse.compare.copyAllRightToLeft".equals(id)) { //$NON-NLS-1$ toolBarManager.remove(iContributionItem); } } @@ -418,17 +418,17 @@ public class TreeContentMergeViewer extends EMFCompareContentMergeViewer { Rectangle rightBounds = rightItem.getBounds(); from.y = leftBounds.y + (leftBounds.height / 2) - leftClientArea.y; - if ("gtk".equals(SWT.getPlatform())) { + if ("gtk".equals(SWT.getPlatform())) { //$NON-NLS-1$ from.y -= 1; - } else if ("win32".equals(SWT.getPlatform())) { + } else if ("win32".equals(SWT.getPlatform())) { //$NON-NLS-1$ from.y += 1; } to.x = control.getBounds().width; to.y = rightBounds.y + (rightBounds.height / 2) - rightClientArea.y; - if ("gtk".equals(SWT.getPlatform())) { + if ("gtk".equals(SWT.getPlatform())) { //$NON-NLS-1$ to.y -= 1; - } else if ("win32".equals(SWT.getPlatform())) { + } else if ("win32".equals(SWT.getPlatform())) { //$NON-NLS-1$ to.y += 1; } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties index 9b7e4b3d9..e4958fda3 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.properties @@ -19,6 +19,8 @@ compareProgressTask.title= Computing Differences... tooComplexError.title= Error
tooComplexError.message= Too many differences. Turn on the 'Ignore White Space' option or do a structure compare first.
+UnkownResource = Unknown Resource
+
#####################################################
# Toolbar actions
#####################################################
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java index 79564e9a0..912e46d73 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/DynamicObject.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -193,7 +193,7 @@ public class DynamicObject { if (member instanceof AccessibleObject) {
((AccessibleObject)member).setAccessible(true);
} else {
- throw new RuntimeException("Can not set accessible " + member);
+ throw new RuntimeException("Can not set accessible " + member); //$NON-NLS-1$
}
}
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java index 15fb344d5..ebe4cda2b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -77,8 +78,8 @@ public class CompareInDialog extends AbstractCompareHandler { && right instanceof EObject && (EcoreUtil.isAncestor((EObject)left, (EObject)right) || EcoreUtil.isAncestor( (EObject)right, (EObject)left))) { - MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", - "Can't run a comparison between an object and one of its ancestor."); + MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", //$NON-NLS-1$ + EMFCompareIDEUIMessages.getString("CompareSelfWithAncestor")); //$NON-NLS-1$ } else { final CompareEditorInput input = createCompareEditorInput(activePart, adapterFactory, left, right, origin); diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java index 8a493aead..742f36999 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -77,8 +78,8 @@ public class CompareInNewEditor extends AbstractCompareHandler { && right instanceof EObject && (EcoreUtil.isAncestor((EObject)left, (EObject)right) || EcoreUtil.isAncestor( (EObject)right, (EObject)left))) { - MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", - "Can't run a comparison between an object and one of its ancestor."); + MessageDialog.openInformation(activePart.getSite().getShell(), "EMF Compare", //$NON-NLS-1$ + EMFCompareIDEUIMessages.getString("CompareSelfWithAncestor")); //$NON-NLS-1$ } else { final CompareEditorInput input = createCompareEditorInput(activePart, adapterFactory, left, right, origin); diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java index 698a55dc7..18fa7139d 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -61,9 +61,10 @@ public class SelectAncestorDialog extends MessageDialog { for (int i = 0; i < 3; i++) { buttons[i] = new Button(composite, SWT.RADIO); buttons[i].addSelectionListener(selectionListener); - String text = "'" + AdapterFactoryUtil.getText(adapterFactory, notifiers[i]) + "'"; + @SuppressWarnings("deprecation") + String text = "'" + AdapterFactoryUtil.getText(adapterFactory, notifiers[i]) + "'"; //$NON-NLS-1$ //$NON-NLS-2$ if (notifiers[i] instanceof EObject) { - text = text + " (" + EcoreUtil.getURI(((EObject)notifiers[i])) + ")"; + text = text + " (" + EcoreUtil.getURI(((EObject)notifiers[i])) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } buttons[i].setText(text); buttons[i].setFont(parent.getFont()); diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties index bead3fbbb..b7b2c680f 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/ide_ui_messages.properties @@ -37,4 +37,6 @@ dropdown.accept.tooltip = Show consequences of accepting change dropdown.reject.tooltip = Show consequences of rejecting change undo.menu.item.text = Merge -redo.menu.item.text = Merge
\ No newline at end of file +redo.menu.item.text = Merge + +CompareSelfWithAncestor = Cannot run a comparison between an object and one of its ancestors.
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java index 50b332ad7..85d500d6f 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,7 +47,6 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.team.core.subscribers.Subscriber;
import org.eclipse.team.core.subscribers.SubscriberMergeContext;
-import org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput;
import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant;
@@ -194,11 +193,12 @@ public final class ComparisonScopeBuilder { */
@SuppressWarnings("restriction")
private static Subscriber getSubscriber(ICompareContainer container) {
- if (container instanceof ModelCompareEditorInput) {
- final ModelCompareEditorInput modelInput = (ModelCompareEditorInput)container;
+ if (container instanceof org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput) {
+ final org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput modelInput = (org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput)container;
ISynchronizeParticipant participant = null;
try {
- final Field field = ModelCompareEditorInput.class.getDeclaredField("participant"); //$NON-NLS-1$
+ final Field field = org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput.class
+ .getDeclaredField("participant"); //$NON-NLS-1$
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
field.setAccessible(true);
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingAdaptable.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingAdaptable.java index e2ae80bbb..be24c6567 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingAdaptable.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingAdaptable.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,8 @@ public abstract class ForwardingAdaptable extends ForwardingObject implements IA *
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ // Suppressing warning : super.getAdapter() is raw
+ @SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
return delegate().getAdapter(adapter);
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RevisionedURIConverter.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RevisionedURIConverter.java index 79667926c..dfea02f63 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RevisionedURIConverter.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RevisionedURIConverter.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2013 Obeo.
+ * Copyright (c) 2011, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -67,7 +67,6 @@ public final class RevisionedURIConverter extends StorageURIConverter { * @see org.eclipse.emf.compare.ide.utils.StorageURIConverter#createInputStream(org.eclipse.emf.common.util.URI,
* java.util.Map)
*/
- @SuppressWarnings("resource")
@Override
public InputStream createInputStream(URI uri, Map<?, ?> options) throws IOException {
InputStream stream = null;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressInfoComposite.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressInfoComposite.java index 605e1f1ee..bebb68913 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressInfoComposite.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressInfoComposite.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,7 +64,7 @@ public class JobProgressInfoComposite extends Composite { gridLayout.horizontalSpacing = 2;
setLayout(gridLayout);
- Image jobImage = EMFCompareIDEUIPlugin.getImage("icons/full/eobj16/task.gif");
+ Image jobImage = EMFCompareIDEUIPlugin.getImage("icons/full/eobj16/task.gif"); //$NON-NLS-1$
jobNameLabel = new Label(this, SWT.NONE);
int horizontalIndent = jobImage.getBounds().width + 2;
GridData gridData = new GridData();
@@ -101,8 +101,8 @@ public class JobProgressInfoComposite extends Composite { JobProgressInfoComposite.this.job.cancel();
}
});
- actionButton.setImage(EMFCompareIDEUIPlugin.getImage("icons/full/dobj16/stop.gif"));
- actionButton.setDisabledImage(EMFCompareIDEUIPlugin.getImage("icons/full/eobj16/stop.gif"));
+ actionButton.setImage(EMFCompareIDEUIPlugin.getImage("icons/full/dobj16/stop.gif")); //$NON-NLS-1$
+ actionButton.setDisabledImage(EMFCompareIDEUIPlugin.getImage("icons/full/eobj16/stop.gif")); //$NON-NLS-1$
taskNameLabel = new Label(this, SWT.NONE);
gridData = new GridData();
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressMonitorWrapper.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressMonitorWrapper.java index 540794f13..46cc02238 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressMonitorWrapper.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/progress/JobProgressMonitorWrapper.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,12 +38,12 @@ public final class JobProgressMonitorWrapper extends ProgressMonitorWrapper { * @see org.eclipse.core.runtime.ProgressMonitorWrapper#beginTask(java.lang.String, int)
*/
@Override
- public void beginTask(String name, int totalWork) {
- this.totalWork = totalWork;
+ public void beginTask(String name, int tota) {
+ this.totalWork = tota;
this.worked = 0;
this.progressInfoItem.init();
this.progressInfoItem.setTaskName(name);
- super.beginTask(name, totalWork);
+ super.beginTask(name, tota);
}
/**
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java index 495b00e86..c6ea4ab90 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -364,6 +364,8 @@ public abstract class AbstractStructuredViewerWrapper<C extends Control, V exten *
* @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, boolean)
*/
+ // Suppressing warning : super is raw
+ @SuppressWarnings("rawtypes")
@Override
protected final void setSelectionToWidget(List l, boolean reveal) {
fViewer.setSelectionToWidget(l, reveal);
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java index f5048801c..b84b8311b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -92,7 +92,7 @@ public class CompareToolBar implements ISelectionChangedListener { IMenuService menuService = (IMenuService)workbench.getService(IMenuService.class);
if (menuService != null) {
menuService.populateContributionManager(toolbarManager,
- "toolbar:org.eclipse.emf.compare.structuremergeviewer.toolbar");
+ "toolbar:org.eclipse.emf.compare.structuremergeviewer.toolbar"); //$NON-NLS-1$
}
boolean leftEditable = compareConfiguration.isLeftEditable();
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java index 17e30a969..67ef5ed4d 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -228,7 +228,7 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap } }; - navigatable = new Navigatable(fAdapterFactory, getViewer()); + navigatable = new Navigatable(getViewer()); toolBar = new CompareToolBar(structureMergeViewerGrouper, structureMergeViewerFilter, getCompareConfiguration()); @@ -340,12 +340,12 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap * @see org.eclipse.jface.viewers.TreeViewer#isExpandable(java.lang.Object) */ @Override - public boolean isExpandable(Object parent) { + public boolean isExpandable(Object element) { if (hasFilters()) { // workaround for 65762 - return getFilteredChildren(parent).length > 0; + return getFilteredChildren(element).length > 0; } - return super.isExpandable(parent); + return super.isExpandable(element); } }; treeViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); @@ -432,7 +432,7 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap } @Subscribe - public void mergePreviewModeChange(IMergePreviewModeChange event) { + public void mergePreviewModeChange(@SuppressWarnings("unused") IMergePreviewModeChange event) { dependencyData.updateDependencies(getSelection()); internalRedraw(); } @@ -445,7 +445,8 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap } @Subscribe - public void handleDifferenceGroupProviderChange(IDifferenceGroupProviderChange event) { + public void handleDifferenceGroupProviderChange( + @SuppressWarnings("unused") IDifferenceGroupProviderChange event) { SWTUtil.safeRefresh(this, false); } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/IWrappableStructuredViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/IWrappableStructuredViewer.java index 937e15e1d..c1a6147ca 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/IWrappableStructuredViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/IWrappableStructuredViewer.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -220,6 +220,8 @@ interface IWrappableStructuredViewer { *
* @see org.eclipse.jface.viewers.StructuredViewer#getSelectionFromWidget()
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
List getSelectionFromWidget();
/**
@@ -440,6 +442,8 @@ interface IWrappableStructuredViewer { *
* @see org.eclipse.jface.viewers.StructuredViewer#setSelectionToWidget(java.util.List, boolean)
*/
+ @SuppressWarnings("rawtypes")
+ // Suppressing warning since super is raw
void setSelectionToWidget(List l, boolean reveal);
/**
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java index 3443925cc..7a69f448b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/Navigatable.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@ package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer; import java.util.Arrays;
import org.eclipse.compare.INavigatable;
-import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.ISelection;
@@ -26,15 +25,12 @@ import org.eclipse.swt.widgets.Item; */
public class Navigatable implements INavigatable {
- private final AdapterFactory adapterFactory;
-
private final WrappableTreeViewer viewer;
/**
* @param adapterFactory
*/
- public Navigatable(AdapterFactory adapterFactory, WrappableTreeViewer viewer) {
- this.adapterFactory = adapterFactory;
+ public Navigatable(WrappableTreeViewer viewer) {
this.viewer = viewer;
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java index 61453875c..da8aa0223 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -221,6 +221,8 @@ class WrappableTreeViewer extends TreeViewer implements IWrappableStructuredView *
* @see org.eclipse.jface.viewers.TreeViewer#setSelection(java.util.List)
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
@Override
public void setSelection(List items) {
super.setSelection(items);
@@ -481,6 +483,8 @@ class WrappableTreeViewer extends TreeViewer implements IWrappableStructuredView * @see org.eclipse.jface.viewers.AbstractTreeViewer#isSameSelection(java.util.List,
* org.eclipse.swt.widgets.Item[])
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
@Override
public boolean isSameSelection(List items, Item[] current) {
return super.isSameSelection(items, current);
@@ -542,6 +546,8 @@ class WrappableTreeViewer extends TreeViewer implements IWrappableStructuredView *
* @see org.eclipse.jface.viewers.AbstractTreeViewer#getSelectionFromWidget()
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
@Override
public List getSelectionFromWidget() {
return super.getSelectionFromWidget();
@@ -675,6 +681,8 @@ class WrappableTreeViewer extends TreeViewer implements IWrappableStructuredView *
* @see org.eclipse.jface.viewers.AbstractTreeViewer#setSelectionToWidget(java.util.List, boolean)
*/
+ // Suppressing warning since super is raw
+ @SuppressWarnings("rawtypes")
@Override
public void setSelectionToWidget(List v, boolean reveal) {
super.setSelectionToWidget(v, reveal);
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java index b0b4eb282..7dbeb9c7f 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -31,6 +31,7 @@ import org.eclipse.emf.compare.domain.IMergeRunnable; import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages; import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin; import org.eclipse.emf.compare.internal.merge.MergeMode; +import org.eclipse.emf.compare.internal.utils.ComparisonUtil; import org.eclipse.emf.compare.merge.IMerger; import org.eclipse.emf.compare.merge.IMerger.Registry; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroup; @@ -155,8 +156,8 @@ public class MergeAction extends BaseSelectionListenerAction { List<Diff> differencesToMerge = newArrayList(selectedDifferences); if (cascadingDifferencesFilterEnabled) { - Iterable<Diff> cascadingDifferences = concat(transform(selectedDifferences, - org.eclipse.emf.compare.utils.DiffUtil.getSubDiffs(leftToRight))); + Iterable<Diff> cascadingDifferences = concat(transform(selectedDifferences, ComparisonUtil + .getSubDiffs(leftToRight))); addAll(differencesToMerge, cascadingDifferences); } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java index 406800e95..60b117305 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -78,31 +78,31 @@ final class MergeRunnableImpl implements IMergeRunnable { * @param isLeftEditable
* @param isRightEditable
*/
- private void markAllAsMerged(Collection<Diff> diffToMarkAsMerged, MergeMode mergeMode) {
+ private void markAllAsMerged(Collection<Diff> diffToMarkAsMerged, MergeMode mode) {
for (Diff diff : diffToMarkAsMerged) {
- markAsMerged(diff, mergeMode);
+ markAsMerged(diff, mode);
}
}
- private void markAsMerged(Diff diff, MergeMode mergeMode) {
+ private void markAsMerged(Diff diff, MergeMode mode) {
diff.setState(DifferenceState.MERGED);
- addOrUpdateMergeData(diff, mergeMode);
+ addOrUpdateMergeData(diff, mode);
}
- private void addOrUpdateMergeData(Collection<Diff> differences, MergeMode mergeMode) {
+ private void addOrUpdateMergeData(Collection<Diff> differences, MergeMode mode) {
for (Diff difference : differences) {
- addOrUpdateMergeData(difference, mergeMode);
+ addOrUpdateMergeData(difference, mode);
}
}
- private void addOrUpdateMergeData(Diff diff, MergeMode mergeMode) {
+ private void addOrUpdateMergeData(Diff diff, MergeMode mode) {
IMergeData mergeData = (IMergeData)EcoreUtil.getExistingAdapter(diff, IMergeData.class);
if (mergeData != null) {
- mergeData.setMergeMode(mergeMode);
+ mergeData.setMergeMode(mode);
mergeData.setLeftEditable(isLeftEditable);
mergeData.setRightEditable(isRightEditable);
} else {
- mergeData = new MergeDataImpl(mergeMode, isLeftEditable, isRightEditable);
+ mergeData = new MergeDataImpl(mode, isLeftEditable, isRightEditable);
diff.eAdapters().add(mergeData);
}
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInput.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInput.java index 0849434d5..54e316c72 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInput.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -80,8 +80,8 @@ public class TreeNodeCompareInput extends CompareInputAdapter implements INotify } if (getAdapterFactory() instanceof IChangeNotifier) { - IChangeNotifier changeNotifier = (IChangeNotifier)getAdapterFactory(); - changeNotifier.fireNotifyChanged(notification); + IChangeNotifier localChangeNotifier = (IChangeNotifier)getAdapterFactory(); + localChangeNotifier.fireNotifyChanged(notification); } } diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java index 460e88017..a51a23491 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java @@ -1,3 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2007, 2014 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + * Obeo - adapted for EMF Compare + *******************************************************************************/ package org.eclipse.emf.compare.ide.ui.internal.util; import java.util.ArrayList; @@ -17,7 +28,7 @@ import org.eclipse.ui.services.IServiceLocator; public class CompareHandlerService { - private final List fActivations = new ArrayList(); + private final List<IHandlerActivation> fActivations = new ArrayList<IHandlerActivation>(); private final Expression fExpression; @@ -25,7 +36,7 @@ public class CompareHandlerService { private boolean fDisposed; - private List fPaneActivations = new ArrayList(); + private List<IHandlerActivation> fPaneActivations = new ArrayList<IHandlerActivation>(); private IHandlerService fHandlerService; diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java index d85da64d4..fa18d1e52 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@ import com.google.common.annotations.Beta; * code.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public abstract class AbstractModelResolver implements IModelResolver {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java index 1085ee54a..33b0f65b0 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelMinimizer.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; * scope, since we know there can be no differences on such resources.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
+ * @since 4.0
*/
@Beta
public interface IModelMinimizer {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelResolver.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelResolver.java index 7b07bcdb1..08495db1e 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelResolver.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IModelResolver.java @@ -25,6 +25,7 @@ import org.eclipse.emf.compare.ide.utils.StorageTraversal; * </p>
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public interface IModelResolver {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProvider.java index 50e6cd3da..7e3b3dba1 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProvider.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProvider.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; * Used by the logical model to wrap types that can provide IStorages.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public interface IStorageProvider {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java index f3796c3ea..daffbfb7a 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.CoreException; * proper remote content.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public interface IStorageProviderAccessor {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java index eae2c10cd..ba53ee771 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2013 Obeo.
+ * Copyright (c) 2011, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@ import org.eclipse.emf.compare.ide.utils.StorageTraversal; * sides of a comparison while we build its scope.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 4.0
*/
@Beta
public final class SynchronizationModel {
diff --git a/plugins/org.eclipse.emf.compare.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide/META-INF/MANIFEST.MF index 2f520720c..19649221b 100644 --- a/plugins/org.eclipse.emf.compare.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.ide;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.ide.EMFCompareIDEPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.emf.compare.ide/pom.xml b/plugins/org.eclipse.emf.compare.ide/pom.xml index 803c32f72..cc77a67ff 100644 --- a/plugins/org.eclipse.emf.compare.ide/pom.xml +++ b/plugins/org.eclipse.emf.compare.ide/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.ide</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/EMFCompareIDEMessages.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/EMFCompareIDEMessages.java new file mode 100644 index 000000000..aec4f9032 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/EMFCompareIDEMessages.java @@ -0,0 +1,79 @@ +/******************************************************************************* + * Copyright (c) 2006, 2014 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.emf.compare.ide.internal; + +import java.text.MessageFormat; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +/** + * Utility class to access externalized Strings for this bundle. + * + * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a> + */ +public final class EMFCompareIDEMessages { + /** Fully qualified path to the properties file in which to seek the keys. */ + private static final String BUNDLE_NAME = "org.eclipse.emf.compare.ide.internal.ide_messages"; //$NON-NLS-1$ + + /** Contains the locale specific {@link String}s needed by this plug-in. */ + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); + + /** + * Utility classes don't need to (and shouldn't) be instantiated. + */ + private EMFCompareIDEMessages() { + // prevents instantiation + } + + /** + * Returns a specified {@link String} from the resource bundle. + * + * @param key + * Key of the String we seek. + * @return The String from the resource bundle associated with <code>key</code>. + */ + public static String getString(String key) { + // Pass through MessageFormat to be consistent in the handling of special chars such as the apostrophe + return MessageFormat.format(internalGetString(key), new Object[] {}); + } + + /** + * Returns a String from the resource bundle bound with the given arguments. + * + * @param key + * Key of the String we seek. + * @param arguments + * Arguments for the String formatting. + * @return formatted {@link String}. + * @see MessageFormat#format(String, Object[]) + */ + public static String getString(String key, Object... arguments) { + if (arguments == null) { + return getString(key); + } + return MessageFormat.format(internalGetString(key), arguments); + } + + /** + * This will return an unformatted String from the resource bundle. + * + * @param key + * Key of the String we seek. + * @return An unformatted String from the bundle. + */ + private static String internalGetString(String key) { + try { + return RESOURCE_BUNDLE.getString(key); + } catch (MissingResourceException e) { + return '!' + key + '!'; + } + } +} diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/ide_messages.properties b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/ide_messages.properties new file mode 100644 index 000000000..38559b4f0 --- /dev/null +++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/ide_messages.properties @@ -0,0 +1,12 @@ +################################################################################ +# Copyright (c) 2013 Obeo. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Obeo - initial API and implementation +################################################################################ +## ! note ! double the apostrophes if you need one in the printed String +NotLoadingResourceSet.monitor.resolve = Create and resolve resource set
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java index 63625d723..97ab0cedc 100644 --- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java +++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.compare.ide.internal.EMFCompareIDEMessages;
import org.eclipse.emf.compare.ide.utils.StorageTraversal;
import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;
import org.eclipse.emf.compare.rcp.policy.ILoadOnDemandPolicy;
@@ -59,7 +60,8 @@ public final class NotLoadingResourceSet extends ResourceSetImpl { * @return resource set to containing the resources described by the given traversals.
*/
public static NotLoadingResourceSet create(final StorageTraversal traversals, IProgressMonitor monitor) {
- SubMonitor progress = SubMonitor.convert(monitor, "Create and resolve resource set", 100);
+ SubMonitor progress = SubMonitor.convert(monitor, EMFCompareIDEMessages
+ .getString("NotLoadingResourceSet.monitor.resolve"), 100); //$NON-NLS-1$
final NotLoadingResourceSet resourceSet = new NotLoadingResourceSet();
resourceSet.setURIResourceMap(new HashMap<URI, Resource>(traversals.getStorages().size() << 1));
@@ -112,8 +114,6 @@ public final class NotLoadingResourceSet extends ResourceSetImpl { * The options to pass to {@link Resource#load(java.util.Map)}.
* @return The loaded EMF Resource if {@code file} was a model, {@code null} otherwise.
*/
- // Suppressing the warning until bug 376938 is fixed
- @SuppressWarnings("resource")
public Resource loadResource(IStorage storage, Map<?, ?> options) {
InputStream stream = null;
Resource resource = null;
diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/ResourceUtil.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/ResourceUtil.java index 5a80617d6..fb6d276b4 100644 --- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/ResourceUtil.java +++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/ResourceUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -200,6 +200,7 @@ public final class ResourceUtil { * @param file * The file for which we need an EMF URI. * @return The created URI. + * @since 4.0 */ public static URI createURIFor(IFile file) { // whether it exists or not (no longer), use platform:/resource @@ -277,37 +278,6 @@ public final class ResourceUtil { } /** - * This will return <code>true</code> if and only if the given IFile has the given <em>contentTypeId</em> - * configured (as returned by {@link IContentTypeManager#findContentTypesFor(InputStream, String) - * Platform.getContentTypeManager().findContentTypesFor(InputStream, String)}. - * - * @param resource - * The resource from which to test the content types. - * @param contentTypeId - * Fully qualified identifier of the content type this <em>resource</em> has to feature. - * @return <code>true</code> if the given {@link IFile} has the given content type. - * @deprecated use {@link #hasContentType(String, IContentType[])} instead. - */ - @Deprecated - public static boolean hasContentType(IFile resource, String contentTypeId) { - IContentTypeManager ctManager = Platform.getContentTypeManager(); - IContentType expected = ctManager.getContentType(contentTypeId); - if (expected == null) { - return false; - } - - final IContentType[] contentTypes = getContentTypes(resource); - - boolean hasContentType = false; - for (int i = 0; i < contentTypes.length && !hasContentType; i++) { - if (contentTypes[i].isKindOf(expected)) { - hasContentType = true; - } - } - return hasContentType; - } - - /** * This will return <code>true</code> if the given <em>contentTypeId</em> represents a content-type * contained in the given array. * @@ -316,7 +286,7 @@ public final class ResourceUtil { * @param contentTypes * The array of content-types to compare against. * @return <code>true</code> if the given array contains a content-type with this id. - * @since 3.1 + * @since 4.0 */ public static boolean hasContentType(String contentTypeId, IContentType[] contentTypes) { IContentTypeManager ctManager = Platform.getContentTypeManager(); @@ -340,7 +310,7 @@ public final class ResourceUtil { * @param file * The file we need the content types of. * @return All content types associated with the given file, an empty array if none. - * @since 3.1 + * @since 4.0 */ public static IContentType[] getContentTypes(IFile file) { IContentTypeManager ctManager = Platform.getContentTypeManager(); diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java index af0240638..d73e057c0 100644 --- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java +++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2012 Obeo.
+ * Copyright (c) 2011, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -62,6 +62,7 @@ public class StorageTraversal implements IAdaptable { *
* @param storage
* The storage to be removed.
+ * @since 4.0
*/
public void removeStorage(IStorage storage) {
storages.remove(storage);
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.ui.tests/META-INF/MANIFEST.MF index d6ae115c1..9acf5ad40 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.rcp.ui.tests;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.rcp.ui.tests.Activator Require-Bundle: org.eclipse.core.runtime, org.junit;bundle-version="4.8.0", diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml index 1fbaa54c8..d74cf9cd1 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.rcp.ui.tests</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.compare.rcp.ui/.settings/org.eclipse.jdt.core.prefs index cca083b3b..82ea6cf75 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.compare.rcp.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,6 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled @@ -37,7 +39,9 @@ org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled @@ -46,9 +50,12 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warni org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=error org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error @@ -66,6 +73,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -89,6 +97,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF index e1fc2f47d..aaaa9ba73 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.rcp.ui;singleton:=true -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -16,14 +16,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0", org.eclipse.emf.compare.rcp;bundle-version="2.1.0" Export-Package: org.eclipse.emf.compare.rcp.ui, org.eclipse.emf.compare.rcp.ui.internal;x-friends:="org.eclipse.emf.compare.diagram.ide.ui,org.eclipse.emf.compare.ide.ui", - org.eclipse.emf.compare.rcp.ui.internal.configuration;x-internal:=true, - org.eclipse.emf.compare.rcp.ui.internal.configuration.impl;x-internal:=true, + org.eclipse.emf.compare.rcp.ui.internal.configuration;x-friends:="org.eclipse.emf.compare.ide.ui", + org.eclipse.emf.compare.rcp.ui.internal.configuration.impl;x-friends:="org.eclipse.emf.compare.ide.ui", org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor;x-friends:="org.eclipse.emf.compare.ide.ui", org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.factory;x-friends:="org.eclipse.emf.compare.ide.ui", org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.factory.impl;x-internal:=true, org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl;x-internal:=true, org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.legacy;x-friends:="org.eclipse.emf.compare.ide.ui", - org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.legacy.impl;x-internal:=true, + org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.legacy.impl;x-friends:="org.eclipse.emf.compare.ide.ui", org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.impl;x-internal:=true, org.eclipse.emf.compare.rcp.ui.internal.mergeviewer;x-friends:="org.eclipse.emf.compare.ide.ui", org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.impl;x-friends:="org.eclipse.emf.compare.ide.ui", @@ -35,7 +35,7 @@ Export-Package: org.eclipse.emf.compare.rcp.ui, org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups;x-friends:="org.eclipse.emf.compare.ide.ui", org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.extender, org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl;x-friends:="org.eclipse.emf.compare.ide.ui", - org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.provider;x-internal:=true, + org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.provider;x-friends:="org.eclipse.emf.compare.ide.ui,org.eclipse.emf.compare.rcp.ui.tests", org.eclipse.emf.compare.rcp.ui.internal.util;x-friends:="org.eclipse.emf.compare.ide.ui" Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", com.google.common.cache;version="[11.0.0,15.0.0)", diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml index b73ac84ba..bfeacbd47 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.rcp.ui/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.rcp.ui</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java index d34f3e36c..270fb355d 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java @@ -1,5 +1,5 @@ /** **************************************************************************** - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -54,6 +54,9 @@ public class EMFCompareRCPUIPlugin extends AbstractUIPlugin { public static final String ACCESSOR_FACTORY_PPID = "accessorFactory"; //$NON-NLS-1$ + /** + * @since 4.0 + */ public static final String DIFFERENCE_GROUP_EXTENDER_PPID = "differenceGroupExtender"; //$NON-NLS-1$ /** @@ -189,11 +192,15 @@ public class EMFCompareRCPUIPlugin extends AbstractUIPlugin { /** * @return the groupProviderRegistry + * @since 4.0 */ public IDifferenceGroupProvider.Descriptor.Registry getDifferenceGroupProviderRegistry() { return groupProviderRegistry; } + /** + * @since 4.0 + */ public IDifferenceFilter.Registry getDifferenceFilterRegistry() { return filterRegistry; } @@ -207,6 +214,7 @@ public class EMFCompareRCPUIPlugin extends AbstractUIPlugin { /** * @return the sub tree registry + * @since 4.0 */ public IDifferenceGroupExtender.Registry getDifferenceGroupExtenderRegistry() { return differenceGroupExtenderRegistry; diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/AccessorFactoryExtensionRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/AccessorFactoryExtensionRegistryListener.java index a6f172d57..711e21e7f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/AccessorFactoryExtensionRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/AccessorFactoryExtensionRegistryListener.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -55,8 +55,8 @@ public class AccessorFactoryExtensionRegistryListener extends AbstractRegistryEv try {
Integer.parseInt(rankingStr);
} catch (NumberFormatException nfe) {
- log(IStatus.ERROR, element, "Attribute '" + ATT_RANKING
- + "' is malformed, should be an integer.");
+ log(IStatus.ERROR, element, "Attribute '" + ATT_RANKING //$NON-NLS-1$
+ + "' is malformed, should be an integer."); //$NON-NLS-1$
}
logMissingAttribute(element, ATT_RANKING);
valid = false;
@@ -81,8 +81,8 @@ public class AccessorFactoryExtensionRegistryListener extends AbstractRegistryEv factory.setRanking(Integer.parseInt(element.getAttribute(ATT_RANKING)));
IAccessorFactory previous = registry.add(factory);
if (previous != null) {
- log(IStatus.WARNING, element, "The accessor factory '" + factory.getClass().getName()
- + "' is registered twice.");
+ log(IStatus.WARNING, element, "The accessor factory '" + factory.getClass().getName() //$NON-NLS-1$
+ + "' is registered twice."); //$NON-NLS-1$
}
} catch (CoreException e) {
log(element, e);
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java index fadf55c45..c95966bf8 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,7 @@ package org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.getFirst; -import static org.eclipse.emf.compare.utils.EMFComparePredicates.containmentReferenceChange; +import static org.eclipse.emf.compare.utils.EMFComparePredicates.CONTAINMENT_REFERENCE_CHANGE; import com.google.common.collect.ImmutableList; @@ -51,7 +51,7 @@ public class ContainmentReferenceChangeAccessorImpl extends AbstractStructuralFe @Override protected ImmutableList<Diff> computeDifferences() { List<Diff> allDifferences = getComparison().getDifferences(); - return ImmutableList.<Diff> copyOf(filter(allDifferences, containmentReferenceChange())); + return ImmutableList.<Diff> copyOf(filter(allDifferences, CONTAINMENT_REFERENCE_CHANGE)); } /** diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java index 0d5b886c5..eb5b15241 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -125,16 +125,13 @@ public class ResourceContentsAccessorImpl extends AbstractTypedElementAdapter im Object ancestor = match.getOrigin(); // Manage case where the resource attachment change is between an existing resource and an unknown // resource - if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.LEFT, - (ResourceAttachmentChange)initialDiff) == null) { + if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.LEFT, initialDiff) == null) { left = null; } - if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.RIGHT, - (ResourceAttachmentChange)initialDiff) == null) { + if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.RIGHT, initialDiff) == null) { right = null; } - if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.ANCESTOR, - (ResourceAttachmentChange)initialDiff) == null) { + if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.ANCESTOR, initialDiff) == null) { ancestor = null; } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties index c1bd22ccb..61688a286 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/emfcomparercpuimessages.properties @@ -9,3 +9,21 @@ # Obeo - initial API and implementation ################################################################################ ## note : apostrophes need to be doubled in these messages or they'll be ignored +TableMergeViewer.directResourceContentsLabel = resource contents + +FilterActionMenu.tooltip = Filters + +GroupActionMenu.tooltip = Groups + +DefaultGroupProvider.label = Default + +KindGroupProvider.addition.label = Additions +KindGroupProvider.deletion.label = Deletions +KindGroupProvider.change.label = Changes +KindGroupProvider.move.label = Moves + +ThreeWayComparisonGroupProvider.conflicts.label = Conflicts +ThreeWayComparisonGroupProvider.left.label = Left Side +ThreeWayComparisonGroupProvider.right.label = Right Side + +BasicDifferenceGroup.name = Group
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java index 2823f08f2..06a5630ad 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.impl; +import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareRCPUIMessages; import org.eclipse.emf.compare.rcp.ui.internal.configuration.IEMFCompareConfiguration; import org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.IStructuralFeatureAccessor; import org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl.ResourceContentsAccessorImpl; @@ -272,7 +273,8 @@ public class TableMergeViewer extends TableOrTreeMergeViewer { if (getLabelProvider() instanceof ILabelProvider) { ILabelProvider labelProvider = (ILabelProvider)getLabelProvider(); - fFeatureLabel.setText("resource contents"); + fFeatureLabel.setText(EMFCompareRCPUIMessages + .getString("TableMergeViewer.directResourceContentsLabel")); //$NON-NLS-1$ fEObjectIcon.setImage(labelProvider.getImage(resource)); fEObjectLabel.setText(labelProvider.getText(resource)); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java index 80c98302b..d7cd1f40f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,7 +18,7 @@ import static com.google.common.collect.Iterables.isEmpty; import static com.google.common.collect.Iterables.size; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newArrayListWithCapacity; -import static org.eclipse.emf.compare.utils.EMFComparePredicates.containmentReferenceChange; +import static org.eclipse.emf.compare.utils.EMFComparePredicates.CONTAINMENT_REFERENCE_CHANGE; import static org.eclipse.emf.compare.utils.EMFComparePredicates.onFeature; import com.google.common.base.Objects; @@ -229,11 +229,14 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { public String toString() { String className = this.getClass().getName(); int start = className.lastIndexOf('.'); - return Objects.toStringHelper(className.substring(start + 1)).add("ancestor", - EObjectUtil.getLabel((EObject)getAncestor())).add("left", - EObjectUtil.getLabel((EObject)getLeft())).add("right", - EObjectUtil.getLabel((EObject)getRight())).add("side", getSide()).add("diff", getDiff()) - .toString(); + // @formatter:off + return Objects.toStringHelper(className.substring(start + 1)) + .add("ancestor", EObjectUtil.getLabel((EObject)getAncestor())) //$NON-NLS-1$ + .add("left", EObjectUtil.getLabel((EObject)getLeft())) //$NON-NLS-1$ + .add("right", EObjectUtil.getLabel((EObject)getRight())) //$NON-NLS-1$ + .add("side", getSide()) //$NON-NLS-1$ + .add("diff", getDiff()).toString(); //$NON-NLS-1$ + // @formatter:on } /** @@ -297,7 +300,7 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { */ private Iterable<? extends Diff> getDiffsWithValue(EObject expectedValue, Match parentMatch) { Iterable<? extends Diff> diffs = filter(fComparison.getDifferences(expectedValue), - containmentReferenceChange()); + CONTAINMENT_REFERENCE_CHANGE); if (size(diffs) > 1) { throw new IllegalStateException("Should not have more than one ReferenceChange on each Match"); //$NON-NLS-1$ } else { @@ -466,7 +469,7 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { Match match = getComparison().getMatch(eObject); ReferenceChange referenceChange = (ReferenceChange)getFirst(filter(getComparison().getDifferences( - eObject), containmentReferenceChange()), null); + eObject), CONTAINMENT_REFERENCE_CHANGE), null); if (match != null) { return new MergeViewerItem.Container(getComparison(), referenceChange, match, getSide(), getAdapterFactory()); @@ -605,7 +608,7 @@ public class MergeViewerItem extends AdapterImpl implements IMergeViewerItem { final ImmutableList<Diff> differences; if (match != null) { differences = ImmutableList.copyOf(filter(match.getDifferences(), - containmentReferenceChange())); + CONTAINMENT_REFERENCE_CHANGE)); } else { differences = ImmutableList.of(); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java index 9284ca9d1..187b3ca6d 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -74,6 +74,7 @@ public class ResourceAttachmentChangeMergeViewerItem extends MergeViewerItem.Con * * @see org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl.MergeViewerItem.Container#getChildren() */ + @SuppressWarnings("unchecked") @Override public IMergeViewerItem[] getChildren(IDifferenceGroupProvider group, Predicate<? super EObject> filters) { Object sideValue = getSideValue(getSide()); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterActionMenu.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterActionMenu.java index 2cf2967cd..52cc0b8db 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterActionMenu.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterActionMenu.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,6 +14,7 @@ import java.util.Collection; import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin; +import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareRCPUIMessages; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.IDifferenceFilter; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.IDifferenceFilter.Registry; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.StructureMergeViewerFilter; @@ -39,7 +40,7 @@ public class FilterActionMenu extends Action implements IMenuCreator { /** Menu Manager that will contain our menu. */ private final MenuManager menuManager; - /** The registry that will be used to retrieve available filters. */ + /** The registry that will be used to retrieve available filters. */ private final Registry registry; /** @@ -57,7 +58,7 @@ public class FilterActionMenu extends Action implements IMenuCreator { this.registry = registry; this.menuManager = new MenuManager(); setMenuCreator(this); - setToolTipText("Filters"); + setToolTipText(EMFCompareRCPUIMessages.getString("FilterActionMenu.tooltip")); //$NON-NLS-1$ setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(EMFCompareRCPUIPlugin.PLUGIN_ID, "icons/full/toolb16/filter.gif")); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java index aafc0a3a8..bfbe5076d 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ package org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.actions; import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin; +import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareRCPUIMessages; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroupProvider; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.StructureMergeViewerGrouper; import org.eclipse.emf.compare.scope.IComparisonScope; @@ -55,7 +56,7 @@ public class GroupActionMenu extends Action implements IMenuCreator { this.registry = registry; this.menuManager = new MenuManager(); this.structureMergeViewerGrouper = structureMergeViewerGrouper; - setToolTipText("Groups"); + setToolTipText(EMFCompareRCPUIMessages.getString("GroupActionMenu.tooltip")); //$NON-NLS-1$ setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(EMFCompareRCPUIPlugin.PLUGIN_ID, "icons/full/toolb16/group.gif")); //$NON-NLS-1$ setMenuCreator(this); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/StructureMergeViewerFilter.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/StructureMergeViewerFilter.java index f35e3a6f0..ca88f67d2 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/StructureMergeViewerFilter.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/StructureMergeViewerFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ import static com.google.common.base.Predicates.alwaysFalse; import static com.google.common.base.Predicates.not; import static com.google.common.base.Predicates.or; import static com.google.common.collect.Iterables.any; -import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newLinkedHashSet; import com.google.common.base.Predicate; @@ -22,7 +21,6 @@ import com.google.common.collect.Iterables; import com.google.common.eventbus.EventBus; import java.util.Collection; -import java.util.List; import java.util.Set; import org.eclipse.emf.common.notify.Adapter; @@ -34,7 +32,6 @@ import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.provider.GroupItemProviderAdapter; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.tree.TreeNode; -import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; @@ -63,9 +60,6 @@ public class StructureMergeViewerFilter extends ViewerFilter { private final Set<IDifferenceFilter> unselectedDifferenceFilters; - /** List of all TreeViewers on which this filter is applied. */ - private final List<StructuredViewer> viewers; - /** The {@link EventBus} associated with this filter. */ private final EventBus eventBus; @@ -99,7 +93,6 @@ public class StructureMergeViewerFilter extends ViewerFilter { this.predicates = newLinkedHashSet(); this.selectedDifferenceFilters = newLinkedHashSet(); this.unselectedDifferenceFilters = newLinkedHashSet(); - this.viewers = newArrayList(); this.aggregatedPredicate = DEFAULT_PREDICATE; } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterExtensionRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterExtensionRegistryListener.java index 525a89ca6..2066474a5 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterExtensionRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterExtensionRegistryListener.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -84,8 +84,8 @@ public class DifferenceFilterExtensionRegistryListener extends AbstractRegistryE }
IDifferenceFilter previous = filterRegistry.add(filter);
if (previous != null) {
- log(IStatus.WARNING, element, "The filter '" + filter.getClass().getName()
- + "' is registered twice.");
+ log(IStatus.WARNING, element, "The filter '" + filter.getClass().getName() //$NON-NLS-1$
+ + "' is registered twice."); //$NON-NLS-1$
}
} catch (CoreException e) {
log(element, e);
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/BasicDifferenceGroupImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/BasicDifferenceGroupImpl.java index 42167cca2..46b91a1e8 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/BasicDifferenceGroupImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/BasicDifferenceGroupImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,9 +20,9 @@ import static com.google.common.collect.Iterators.concat; import static com.google.common.collect.Iterators.transform; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newHashSet; -import static org.eclipse.emf.compare.utils.EMFComparePredicates.containmentMoveReferenceChange; -import static org.eclipse.emf.compare.utils.EMFComparePredicates.containmentReferenceChange; +import static org.eclipse.emf.compare.utils.EMFComparePredicates.CONTAINMENT_REFERENCE_CHANGE; import static org.eclipse.emf.compare.utils.EMFComparePredicates.hasState; +import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind; import static org.eclipse.emf.compare.utils.EMFComparePredicates.valueIs; import com.google.common.base.Function; @@ -42,6 +42,7 @@ import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.Diff; +import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.DifferenceState; import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.MatchResource; @@ -51,6 +52,7 @@ import org.eclipse.emf.compare.provider.utils.ComposedStyledString; import org.eclipse.emf.compare.provider.utils.IStyledString; import org.eclipse.emf.compare.provider.utils.IStyledString.Style; import org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin; +import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareRCPUIMessages; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.extender.IDifferenceGroupExtender; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.ECrossReferenceAdapter; @@ -94,8 +96,6 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference /** The cross reference adapter that will be added to this group's children. */ private final ECrossReferenceAdapter crossReferenceAdapter; - private final IDifferenceGroupProvider groupProvider; - /** * Instantiates this group given the comparison and filter that should be used in order to determine its * list of differences. @@ -112,11 +112,11 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference * @param crossReferenceAdapter * The cross reference adapter that will be added to this group's children. */ - public BasicDifferenceGroupImpl(Comparison comparison, IDifferenceGroupProvider groupProvider, - Predicate<? super Diff> filter, ECrossReferenceAdapter crossReferenceAdapter) { - this(comparison, groupProvider, filter, - "Group", EMFCompareRCPUIPlugin.getImage("icons/full/toolb16/group.gif"), //$NON-NLS-2$ - crossReferenceAdapter); + public BasicDifferenceGroupImpl(Comparison comparison, Predicate<? super Diff> filter, + ECrossReferenceAdapter crossReferenceAdapter) { + this(comparison, filter, + EMFCompareRCPUIMessages.getString("BasicDifferenceGroup.name"), EMFCompareRCPUIPlugin //$NON-NLS-1$ + .getImage("icons/full/toolb16/group.gif"), crossReferenceAdapter); //$NON-NLS-1$ } /** @@ -141,10 +141,10 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference * @param crossReferenceAdapter * The cross reference adapter that will be added to this group's children. */ - public BasicDifferenceGroupImpl(Comparison comparison, IDifferenceGroupProvider groupProvider, - Predicate<? super Diff> filter, String name, ECrossReferenceAdapter crossReferenceAdapter) { - this(comparison, groupProvider, filter, name, EMFCompareRCPUIPlugin - .getImage("icons/full/toolb16/group.gif"), crossReferenceAdapter); //$NON-NLS-1$ + public BasicDifferenceGroupImpl(Comparison comparison, Predicate<? super Diff> filter, String name, + ECrossReferenceAdapter crossReferenceAdapter) { + this(comparison, filter, name, EMFCompareRCPUIPlugin.getImage("icons/full/toolb16/group.gif"), //$NON-NLS-1$ + crossReferenceAdapter); } /** @@ -164,11 +164,9 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference * @param crossReferenceAdapter * Updated upstream The cross reference adapter that will be added to this group's children. */ - public BasicDifferenceGroupImpl(Comparison comparison, IDifferenceGroupProvider groupProvider, - Predicate<? super Diff> filter, String name, Image image, - ECrossReferenceAdapter crossReferenceAdapter) { + public BasicDifferenceGroupImpl(Comparison comparison, Predicate<? super Diff> filter, String name, + Image image, ECrossReferenceAdapter crossReferenceAdapter) { this.comparison = comparison; - this.groupProvider = groupProvider; this.filter = filter; this.name = name; this.image = image; @@ -206,7 +204,7 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference boolean unresolvedDiffs = any(Iterators.filter(eAllData, Diff.class), hasState(DifferenceState.UNRESOLVED)); if (unresolvedDiffs) { - ret.append("> ", Style.DECORATIONS_STYLER); + ret.append("> ", Style.DECORATIONS_STYLER); //$NON-NLS-1$ } ret.append(getName()); return ret; @@ -358,7 +356,7 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference boolean hasNonEmptySubMatch = false; Set<Match> alreadyProcessedSubMatch = newHashSet(); // Manage non-containment changes - for (Diff diff : filter(match.getDifferences(), and(filter, not(or(containmentReferenceChange(), + for (Diff diff : filter(match.getDifferences(), and(filter, not(or(CONTAINMENT_REFERENCE_CHANGE, resourceAttachmentChange()))))) { if (diff.getPrimeRefining() != null && !extensionDiffProcessed.contains(diff)) { continue; @@ -380,7 +378,8 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference } } // Manage move changes - for (Diff diff : filter(match.getDifferences(), and(filter, containmentMoveReferenceChange()))) { + for (Diff diff : filter(match.getDifferences(), and(filter, and(CONTAINMENT_REFERENCE_CHANGE, + ofKind(DifferenceKind.MOVE))))) { if (!containsChildrenWithDataEqualsToDiff(treeNode, diff)) { TreeNode buildSubTree = buildSubTree(diff); if (buildSubTree != null) { @@ -499,7 +498,7 @@ public class BasicDifferenceGroupImpl extends AdapterImpl implements IDifference */ @SuppressWarnings("unchecked") protected Predicate<Diff> containmentReferenceForMatch(Match subMatch) { - return and(filter, containmentReferenceChange(), or(valueIs(subMatch.getLeft()), valueIs(subMatch + return and(filter, CONTAINMENT_REFERENCE_CHANGE, or(valueIs(subMatch.getLeft()), valueIs(subMatch .getRight()), valueIs(subMatch.getOrigin()))); } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryImpl.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryImpl.java index 30a4ec730..e5cc70c2e 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryImpl.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,7 +24,7 @@ import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.exten * The default implementation of the {@link Registry}. * * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a> - * @since 3.0 + * @since 4.0 */ public class DifferenceGroupExtenderRegistryImpl implements Registry { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java index 4d5a5ac53..8fb58a43f 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/DifferenceGroupExtenderRegistryListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,7 +18,7 @@ import org.eclipse.emf.compare.rcp.extension.AbstractRegistryEventListener; /** * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a> - * @since 3.0 + * @since 4.0 */ public class DifferenceGroupExtenderRegistryListener extends AbstractRegistryEventListener { @@ -83,8 +83,8 @@ public class DifferenceGroupExtenderRegistryListener extends AbstractRegistryEve .createExecutableExtension(ATT_CLASS); IDifferenceGroupExtender previous = extendersRegistry.add(extender); if (previous != null) { - log(IStatus.WARNING, element, "The difference group extender '" - + extender.getClass().getName() + "' is registered twice."); + log(IStatus.WARNING, element, "The difference group extender '" //$NON-NLS-1$ + + extender.getClass().getName() + "' is registered twice."); //$NON-NLS-1$ } } catch (CoreException e) { log(element, e); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/IDifferenceGroupExtender.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/IDifferenceGroupExtender.java index e5a58d67b..11f8322b1 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/IDifferenceGroupExtender.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/extender/IDifferenceGroupExtender.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,7 +19,7 @@ import org.eclipse.emf.edit.tree.TreeNode; * in the structure merge viewer. * * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a> - * @since 3.0 + * @since 4.0 */ public interface IDifferenceGroupExtender { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ByResourceGroupProvider.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ByResourceGroupProvider.java index 80c3eafa4..78745aae0 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ByResourceGroupProvider.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ByResourceGroupProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,8 +15,8 @@ import static com.google.common.base.Predicates.not; import static com.google.common.base.Predicates.or; import static com.google.common.collect.Collections2.filter; import static com.google.common.collect.Lists.newArrayList; -import static org.eclipse.emf.compare.utils.EMFComparePredicates.containmentMoveReferenceChange; -import static org.eclipse.emf.compare.utils.EMFComparePredicates.containmentReferenceChange; +import static org.eclipse.emf.compare.utils.EMFComparePredicates.CONTAINMENT_REFERENCE_CHANGE; +import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; @@ -27,6 +27,7 @@ import java.util.List; import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.Diff; +import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.MatchResource; import org.eclipse.emf.compare.ReferenceChange; @@ -67,7 +68,7 @@ public class ByResourceGroupProvider extends AbstractDifferenceGroupProvider { if (group == null || !comparison.equals(comp)) { dispose(); this.comp = comparison; - group = new ResourceGroup(comparison, this, getCrossReferenceAdapter()); + group = new ResourceGroup(comparison, getCrossReferenceAdapter()); } return ImmutableList.of(group); } @@ -138,9 +139,8 @@ public class ByResourceGroupProvider extends AbstractDifferenceGroupProvider { * * @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.BasicDifferenceGroupImpl#BasicDifferenceGroupImpl(org.eclipse.emf.compare.Comparison) */ - public ResourceGroup(Comparison comparison, IDifferenceGroupProvider groupProvider, - ECrossReferenceAdapter crossReferenceAdapter) { - super(comparison, groupProvider, Predicates.<Diff> alwaysTrue(), crossReferenceAdapter); + public ResourceGroup(Comparison comparison, ECrossReferenceAdapter crossReferenceAdapter) { + super(comparison, Predicates.<Diff> alwaysTrue(), crossReferenceAdapter); } /** @@ -235,7 +235,7 @@ public class ByResourceGroupProvider extends AbstractDifferenceGroupProvider { boolean hasDiff = false; boolean hasNonEmptySubMatch = false; for (Diff diff : filter(match.getDifferences(), and(filter, not(or( - containmentReferenceChange(), resourceAttachmentChange()))))) { + CONTAINMENT_REFERENCE_CHANGE, resourceAttachmentChange()))))) { hasDiff = true; treeNode.getChildren().add(wrap(diff)); } @@ -246,7 +246,8 @@ public class ByResourceGroupProvider extends AbstractDifferenceGroupProvider { treeNode.getChildren().addAll(buildSubTree); } } - for (Diff diff : filter(match.getDifferences(), and(filter, containmentMoveReferenceChange()))) { + for (Diff diff : filter(match.getDifferences(), and(filter, and(CONTAINMENT_REFERENCE_CHANGE, + ofKind(DifferenceKind.MOVE))))) { if (!containsChildrenWithDataEqualsToDiff(treeNode, diff)) { TreeNode buildSubTree = buildSubTree(diff); if (buildSubTree != null) { diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DefaultGroupProvider.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DefaultGroupProvider.java index 2ff786a1f..304959f17 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DefaultGroupProvider.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DefaultGroupProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,6 +17,7 @@ import com.google.common.collect.ImmutableList; import java.util.Collection; import org.eclipse.emf.compare.Comparison; +import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareRCPUIMessages; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.BasicDifferenceGroupImpl; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroup; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroupProvider; @@ -41,11 +42,11 @@ public class DefaultGroupProvider extends AbstractDifferenceGroupProvider { * * @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroupProvider#getGroups(org.eclipse.emf.compare.Comparison) */ - public Collection<? extends IDifferenceGroup> getGroups(Comparison comparison) { - if (group == null || !comparison.equals(this.comparison)) { + public Collection<? extends IDifferenceGroup> getGroups(Comparison aComparison) { + if (group == null || !aComparison.equals(this.comparison)) { dispose(); - this.comparison = comparison; - group = new BasicDifferenceGroupImpl(comparison, this, alwaysTrue(), getCrossReferenceAdapter()); + this.comparison = aComparison; + group = new BasicDifferenceGroupImpl(aComparison, alwaysTrue(), getCrossReferenceAdapter()); } return ImmutableList.of(group); } @@ -56,7 +57,7 @@ public class DefaultGroupProvider extends AbstractDifferenceGroupProvider { * @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroupProvider#getLabel() */ public String getLabel() { - return "Default"; + return EMFCompareRCPUIMessages.getString("DefaultGroupProvider.label"); //$NON-NLS-1$ } /** @@ -92,7 +93,7 @@ public class DefaultGroupProvider extends AbstractDifferenceGroupProvider { * @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroupProvider#isEnabled(org * .eclipse.emf.compare.scope.IComparisonScope, org.eclipse.emf.compare.Comparison) */ - public boolean isEnabled(IComparisonScope scope, Comparison comparison) { + public boolean isEnabled(IComparisonScope scope, Comparison aComparison) { return true; } diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java index 389d986d6..4a7c1f779 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -80,8 +80,8 @@ public class DifferenceGroupProviderExtensionRegistryListener extends AbstractRe IDifferenceGroupProvider.Descriptor previous = groupProviderRegistry.add(providerDescriptor, element
.getAttribute(ATT_CLASS));
if (previous != null) {
- log(IStatus.WARNING, element, "The group provider descriptor'" + element.getAttribute(ATT_CLASS)
- + "' is registered twice.");
+ log(IStatus.WARNING, element, "The group provider descriptor'" + element.getAttribute(ATT_CLASS) //$NON-NLS-1$
+ + "' is registered twice."); //$NON-NLS-1$
}
return true;
}
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java index 7f70df38b..c33b01be9 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -19,6 +19,7 @@ import java.util.Collection; import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.DifferenceKind; +import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareRCPUIMessages; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.BasicDifferenceGroupImpl; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroup; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroupProvider; @@ -54,14 +55,18 @@ public class KindGroupProvider extends AbstractDifferenceGroupProvider { if (differenceGroups == null || !comparison.equals(comp)) { dispose(); this.comp = comparison; - final IDifferenceGroup additions = new BasicDifferenceGroupImpl(comparison, this, - ofKind(DifferenceKind.ADD), "Additions", getCrossReferenceAdapter()); - final IDifferenceGroup deletions = new BasicDifferenceGroupImpl(comparison, this, - ofKind(DifferenceKind.DELETE), "Deletions", getCrossReferenceAdapter()); - final IDifferenceGroup changes = new BasicDifferenceGroupImpl(comparison, this, - ofKind(DifferenceKind.CHANGE), "Changes", getCrossReferenceAdapter()); - final IDifferenceGroup moves = new BasicDifferenceGroupImpl(comparison, this, - ofKind(DifferenceKind.MOVE), "Moves", getCrossReferenceAdapter()); + final IDifferenceGroup additions = new BasicDifferenceGroupImpl(comparison, + ofKind(DifferenceKind.ADD), EMFCompareRCPUIMessages + .getString("KindGroupProvider.addition.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + final IDifferenceGroup deletions = new BasicDifferenceGroupImpl(comparison, + ofKind(DifferenceKind.DELETE), EMFCompareRCPUIMessages + .getString("KindGroupProvider.deletion.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + final IDifferenceGroup changes = new BasicDifferenceGroupImpl(comparison, + ofKind(DifferenceKind.CHANGE), EMFCompareRCPUIMessages + .getString("KindGroupProvider.change.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + final IDifferenceGroup moves = new BasicDifferenceGroupImpl(comparison, + ofKind(DifferenceKind.MOVE), EMFCompareRCPUIMessages + .getString("KindGroupProvider.move.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ Collection<IDifferenceGroup> groups = Lists.newArrayList(); if (!additions.getChildren().isEmpty()) { groups.add(additions); diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java index 1de06184f..e490b9aa2 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -43,6 +43,7 @@ import org.eclipse.emf.compare.provider.utils.ComposedStyledString; import org.eclipse.emf.compare.provider.utils.IStyledString; import org.eclipse.emf.compare.provider.utils.IStyledString.IComposedStyledString; import org.eclipse.emf.compare.provider.utils.IStyledString.Style; +import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareRCPUIMessages; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.BasicDifferenceGroupImpl; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroup; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroupProvider; @@ -81,14 +82,17 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv if (differenceGroups == null || !comparison.equals(comp)) { dispose(); this.comp = comparison; - final IDifferenceGroup conflicts = new ConflictsGroupImpl(comparison, this, hasConflict( - ConflictKind.REAL, ConflictKind.PSEUDO), "Conflicts", getCrossReferenceAdapter()); - final IDifferenceGroup leftSide = new BasicDifferenceGroupImpl(comparison, this, Predicates.and( + final IDifferenceGroup conflicts = new ConflictsGroupImpl(comparison, hasConflict( + ConflictKind.REAL, ConflictKind.PSEUDO), EMFCompareRCPUIMessages + .getString("ThreeWayComparisonGroupProvider.conflicts.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + final IDifferenceGroup leftSide = new BasicDifferenceGroupImpl(comparison, Predicates.and( fromSide(DifferenceSource.LEFT), Predicates.not(hasConflict(ConflictKind.REAL, - ConflictKind.PSEUDO))), "Left side", getCrossReferenceAdapter()); - final IDifferenceGroup rightSide = new BasicDifferenceGroupImpl(comparison, this, Predicates.and( + ConflictKind.PSEUDO))), EMFCompareRCPUIMessages + .getString("ThreeWayComparisonGroupProvider.left.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ + final IDifferenceGroup rightSide = new BasicDifferenceGroupImpl(comparison, Predicates.and( fromSide(DifferenceSource.RIGHT), Predicates.not(hasConflict(ConflictKind.REAL, - ConflictKind.PSEUDO))), "Right side", getCrossReferenceAdapter()); + ConflictKind.PSEUDO))), EMFCompareRCPUIMessages + .getString("ThreeWayComparisonGroupProvider.right.label"), getCrossReferenceAdapter()); //$NON-NLS-1$ differenceGroups = ImmutableList.of(conflicts, leftSide, rightSide); } @@ -157,9 +161,9 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv * @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.BasicDifferenceGroupImpl#BasicDifferenceGroupImpl(org.eclipse.emf.compare.Comparison, * java.lang.Iterable, com.google.common.base.Predicate, java.lang.String) */ - public ConflictsGroupImpl(Comparison comparison, IDifferenceGroupProvider groupProvider, - Predicate<? super Diff> filter, String name, ECrossReferenceAdapter crossReferenceAdapter) { - super(comparison, groupProvider, filter, name, crossReferenceAdapter); + public ConflictsGroupImpl(Comparison comparison, Predicate<? super Diff> filter, String name, + ECrossReferenceAdapter crossReferenceAdapter) { + super(comparison, filter, name, crossReferenceAdapter); } /** @@ -177,7 +181,7 @@ public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProv boolean unresolvedDiffs = any(diffs, and(hasState(DifferenceState.UNRESOLVED), hasConflict( ConflictKind.REAL, ConflictKind.PSEUDO))); if (unresolvedDiffs) { - ret.append("> ", Style.DECORATIONS_STYLER); + ret.append("> ", Style.DECORATIONS_STYLER); //$NON-NLS-1$ } ret.append(getName()); return ret; diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java index b6cc96162..b7259d778 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,7 +30,6 @@ import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.MatchResource; import org.eclipse.emf.compare.ReferenceChange; import org.eclipse.emf.compare.ResourceAttachmentChange; -import org.eclipse.emf.compare.internal.utils.DiffUtil; import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.IMergeViewer.MergeViewerSide; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroup; import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.IDifferenceGroupProvider; @@ -325,11 +324,18 @@ public final class MergeViewerUtil { } /** - * Predicates that apply {@link DiffUtil#isPrimeRefining(EObject)}. + * Check if the given object is a Diff that is a prime refining of one of its refine diffs. */ private static final Predicate<EObject> IS_PRIME_REFINING = new Predicate<EObject>() { public boolean apply(EObject eObject) { - return DiffUtil.isPrimeRefining(eObject); + if (eObject instanceof Diff) { + for (Diff refine : ((Diff)eObject).getRefines()) { + if (refine.getPrimeRefining() == eObject) { + return true; + } + } + } + return false; } }; } diff --git a/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF index 5a7b7395e..8dc442c8c 100644 --- a/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.rcp;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.emf.compare.rcp/pom.xml b/plugins/org.eclipse.emf.compare.rcp/pom.xml index 05027c52a..6f0bd7b68 100644 --- a/plugins/org.eclipse.emf.compare.rcp/pom.xml +++ b/plugins/org.eclipse.emf.compare.rcp/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.rcp</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/AbstractRegistryEventListener.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/AbstractRegistryEventListener.java index 57021eccd..e4ddb498f 100644 --- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/AbstractRegistryEventListener.java +++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/AbstractRegistryEventListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -60,6 +60,7 @@ public abstract class AbstractRegistryEventListener implements IRegistryEventLis */ private final String extensionPointID; + /** The log in which to report failures from this listener. */ private final ILog log; /** @@ -184,12 +185,15 @@ public abstract class AbstractRegistryEventListener implements IRegistryEventLis * the name of the missing attribute. */ protected void logMissingAttribute(IConfigurationElement element, String attributeName) { - log(IStatus.ERROR, element, "The required attribute '" + attributeName + "' not defined"); + log(IStatus.ERROR, element, "The required attribute '" + attributeName + "' not defined"); //$NON-NLS-1$ //$NON-NLS-2$ } /** * Log the error to the current plugin logger. * + * @param severity + * Severity of this message. One of <code>IStatus.OK</code>, <code>IStatus.ERROR</code>, + * <code>IStatus.INFO</code>, <code>IStatus.WARNING</code>, or <code>IStatus.CANCEL</code> * @param element * the element from which comes to the error. * @param message @@ -204,8 +208,8 @@ public abstract class AbstractRegistryEventListener implements IRegistryEventLis * * @param element * the element from which comes to the error. - * @param message - * the message to be logged. + * @param t + * the exception to be logged. */ protected void log(IConfigurationElement element, Throwable t) { log.log(new Status(IStatus.ERROR, element.getDeclaringExtension().getContributor().getName(), t @@ -221,6 +225,7 @@ public abstract class AbstractRegistryEventListener implements IRegistryEventLis * Human-readable cause of this exception. * @param cause * Actual exception that is to be logged. + * @since 3.0 */ protected void log(IConfigurationElement element, String errorMessage, Throwable cause) { log.log(new Status(IStatus.ERROR, element.getDeclaringExtension().getContributor().getName(), diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/PluginClassDescriptor.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/PluginClassDescriptor.java index 01e9595e8..7edd01120 100644 --- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/PluginClassDescriptor.java +++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/PluginClassDescriptor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002-2013 IBM Corporation and others. + * Copyright (c) 2002, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.emf.compare.rcp.extension; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionRegistry; /** * Simple utility class to create proxy of extension that are @@ -21,11 +20,14 @@ import org.eclipse.core.runtime.IExtensionRegistry; * <p> * No test of the {@link IConfigurationElement#isValid() validity} of the wrapped * {@link IConfigurationElement} is performed. As such you should always extend this class while listening to - * the {@link IExtensionRegistry} and react properly the removal of the wrapped {@link IConfigurationElement}. + * the {@link org.eclipse.core.runtime.IExtensionRegistry} and react properly the removal of the wrapped + * {@link IConfigurationElement}. * <p> * Note: this is based on {@code org.eclipse.emf.ecore.plugin.RegistryReader.PluginClassDescriptor} * * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a> + * @param <T> + * Type of the instances created from this descriptor. */ public class PluginClassDescriptor<T> { /** diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/adapterfactory/AdapterFactoryDescriptorRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/adapterfactory/AdapterFactoryDescriptorRegistryListener.java index b6241d841..fe1229397 100644 --- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/adapterfactory/AdapterFactoryDescriptorRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/adapterfactory/AdapterFactoryDescriptorRegistryListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -17,8 +17,8 @@ import java.util.StringTokenizer; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IStatus; -import org.eclipse.emf.compare.internal.adapterfactory.RankedAdapterFactoryDescriptorRegistryImpl; import org.eclipse.emf.compare.internal.adapterfactory.RankedAdapterFactoryDescriptor; +import org.eclipse.emf.compare.internal.adapterfactory.RankedAdapterFactoryDescriptorRegistryImpl; import org.eclipse.emf.compare.rcp.extension.AbstractRegistryEventListener; /** diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/merger/MergerExtensionRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/merger/MergerExtensionRegistryListener.java index 014de3197..654179713 100644 --- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/merger/MergerExtensionRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/merger/MergerExtensionRegistryListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,6 +20,8 @@ import org.eclipse.emf.compare.rcp.internal.EMFCompareRCPMessages; /** * Listener for contributions to the merger extension. + * + * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a> */ public class MergerExtensionRegistryListener extends AbstractRegistryEventListener { @@ -32,6 +34,7 @@ public class MergerExtensionRegistryListener extends AbstractRegistryEventListen /** ATT_RANKING. */ private static final String ATT_RANKING = "ranking"; //$NON-NLS-1$ + /** The actual registry we'll populate. */ private final IMerger.Registry mergerRegistry; /** @@ -41,7 +44,10 @@ public class MergerExtensionRegistryListener extends AbstractRegistryEventListen * The plugin id. * @param extensionPointID * The extension point id. + * @param log + * The log in which to report failures. * @param mergerRegistry + * The actual registry that will be populated by this listener. */ public MergerExtensionRegistryListener(String pluginID, String extensionPointID, ILog log, IMerger.Registry mergerRegistry) { diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryListener.java index 21aed8bad..cf1f696e1 100644 --- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryListener.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,6 +43,8 @@ public class LoadOnDemandPolicyRegistryListener extends AbstractRegistryEventLis * the plugin id of the registering extension point.
* @param extensionPointID
* the id of the extension point to listen to.
+ * @param log
+ * the log in which to report errors.
*/
public LoadOnDemandPolicyRegistryListener(ILoadOnDemandPolicy.Registry registry, String pluginID,
String extensionPointID, ILog log) {
@@ -60,13 +62,11 @@ public class LoadOnDemandPolicyRegistryListener extends AbstractRegistryEventLis if (TAG_POLICY.equals(element.getName())) {
if (element.getAttribute(ATT_CLASS) == null) {
logMissingAttribute(element, ATT_CLASS);
- return false;
} else {
return true;
}
- } else {
- return false;
}
+ return false;
}
/**
@@ -80,8 +80,8 @@ public class LoadOnDemandPolicyRegistryListener extends AbstractRegistryEventLis ILoadOnDemandPolicy policy = (ILoadOnDemandPolicy)element.createExecutableExtension(ATT_CLASS);
ILoadOnDemandPolicy previous = registry.addPolicy(policy);
if (previous != null) {
- log(IStatus.WARNING, element, "The factory '" + policy.getClass().getName()
- + "' is registered twice.");
+ log(IStatus.WARNING, element, "The factory '" + policy.getClass().getName() //$NON-NLS-1$
+ + "' is registered twice."); //$NON-NLS-1$
}
} catch (CoreException e) {
log(IStatus.ERROR, element, e.getMessage());
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/postprocessor/PostProcessorFactoryRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/postprocessor/PostProcessorFactoryRegistryListener.java index 2c02b40a6..c4d12b654 100644 --- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/postprocessor/PostProcessorFactoryRegistryListener.java +++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/postprocessor/PostProcessorFactoryRegistryListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -110,7 +110,7 @@ public class PostProcessorFactoryRegistryListener extends AbstractRegistryEventL valid = true; } } else { - log(IStatus.ERROR, element, "Post processor must have an nsURI or a resource URI"); + log(IStatus.ERROR, element, "Post processor must have an nsURI or a resource URI"); //$NON-NLS-1$ valid = false; } } else { @@ -144,7 +144,7 @@ public class PostProcessorFactoryRegistryListener extends AbstractRegistryEventL IPostProcessor.Descriptor previous = registry.put(className, descriptor); if (previous != null) { EMFCompareRCPPlugin.getDefault().log(IStatus.WARNING, - "The post processor factory '" + className + "' is registered twice."); + "The post processor factory '" + className + "' is registered twice."); //$NON-NLS-1$//$NON-NLS-2$ } return true; } diff --git a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF index ca023a0c6..60392c6d2 100644 --- a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.tests;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.emf.compare.tests.EMFCompareTestsPlugin Bundle-ClassPath: . Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.compare.tests/pom.xml b/plugins/org.eclipse.emf.compare.tests/pom.xml index 6d3d541c9..d456f8cd1 100644 --- a/plugins/org.eclipse.emf.compare.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.tests/pom.xml @@ -5,12 +5,12 @@ <parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.tests</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java index 03daf89d3..e6556ed94 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/AttributeChangeTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareAdapterFactoryTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareAdapterFactoryTest.java index d8f2ed52c..d4f437853 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareAdapterFactoryTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareAdapterFactoryTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.eclipse.emf.compare.AttributeChange; import org.eclipse.emf.compare.CompareFactory; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareFactoryTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareFactoryTest.java index a255b91f9..fdd034d64 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareFactoryTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareFactoryTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.eclipse.emf.compare.AttributeChange; import org.eclipse.emf.compare.CompareFactory; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareSwitchTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareSwitchTest.java index 505c9c510..23d4fd4e8 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareSwitchTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/CompareSwitchTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertNull; import org.eclipse.emf.compare.AttributeChange; import org.eclipse.emf.compare.CompareFactory; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ComparisonTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ComparisonTest.java index d3fbbf996..561c66475 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ComparisonTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ComparisonTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; @@ -212,6 +212,8 @@ public class ComparisonTest extends AbstractCompareTest { * * @generated */ + // generated test. Suppress the warning + @SuppressWarnings("boxing") @Test public void testThreeWay() { EStructuralFeature feature = org.eclipse.emf.compare.ComparePackage.eINSTANCE diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ConflictKindTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ConflictKindTest.java index 970670877..d2ae59bde 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ConflictKindTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ConflictKindTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,15 +10,11 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; - -import org.junit.Test; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; import org.eclipse.emf.compare.ConflictKind; +import org.junit.Test; /** * Tests the behavior of the {@link ConflictKind} enumeration. diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ConflictTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ConflictTest.java index 3c9905c3f..f59905169 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ConflictTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ConflictTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java index 94134a4d3..65d25498f 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DiffTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceKindTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceKindTest.java index 8a0624fd8..4852be958 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceKindTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceKindTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; import org.eclipse.emf.compare.DifferenceKind; import org.junit.Test; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceSourceTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceSourceTest.java index 2df0fde32..502399848 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceSourceTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceSourceTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; import org.eclipse.emf.compare.DifferenceSource; import org.junit.Test; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceStateTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceStateTest.java index 7d660da71..f627684cc 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceStateTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/DifferenceStateTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,15 +10,11 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; - -import org.junit.Test; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; import org.eclipse.emf.compare.DifferenceState; +import org.junit.Test; /** * Tests the behavior of the {@link DifferenceState} enumeration. diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java index 39275d361..fd8e4ef2d 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/EquivalenceTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchResourceTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchResourceTest.java index b8c6dc8e8..c39ebbaaa 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchResourceTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchResourceTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.eclipse.emf.compare.CompareFactory; import org.eclipse.emf.compare.MatchResource; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchTest.java index c74a1668d..a893de994 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/MatchTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java index 4c562bc95..1413c2a3e 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ReferenceChangeTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java index ea9acfb65..307489095 100644 --- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/unit/ResourceAttachmentChangeTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.unit; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/AbstractTestCompareCommandStack.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/AbstractTestCompareCommandStack.java index 7de3334f8..15a3813e2 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/AbstractTestCompareCommandStack.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/AbstractTestCompareCommandStack.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,16 +31,12 @@ public abstract class AbstractTestCompareCommandStack { private MockCompareCommand leftToRight3;
- private MockCompareCommand leftToRight4;
-
private MockCompareCommand rightToLeft1;
private MockCompareCommand rightToLeft2;
private MockCompareCommand rightToLeft3;
- private MockCompareCommand rightToLeft4;
-
@Before
public void before() {
commandStack = createCommandStack();
@@ -48,12 +44,10 @@ public abstract class AbstractTestCompareCommandStack { leftToRight1 = new MockCompareCommand(true);
leftToRight2 = new MockCompareCommand(true);
leftToRight3 = new MockCompareCommand(true);
- leftToRight4 = new MockCompareCommand(true);
rightToLeft1 = new MockCompareCommand(false);
rightToLeft2 = new MockCompareCommand(false);
rightToLeft3 = new MockCompareCommand(false);
- rightToLeft4 = new MockCompareCommand(false);
}
/**
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/TestCompareSideCommandStack.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/TestCompareSideCommandStack.java index 251106a92..951bbe9ae 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/TestCompareSideCommandStack.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/TestCompareSideCommandStack.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,15 +31,12 @@ public class TestCompareSideCommandStack { private MockCompareCommand leftToRight3;
- private MockCompareCommand leftToRight4;
-
@Before
public void before() {
commandStack = new CompareSideCommandStack();
leftToRight1 = new MockCompareCommand(true);
leftToRight2 = new MockCompareCommand(true);
leftToRight3 = new MockCompareCommand(true);
- leftToRight4 = new MockCompareCommand(true);
}
@Test
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java index 59e7d603b..ce82aa58e 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,10 +11,6 @@ package org.eclipse.emf.compare.tests.conflict;
import static com.google.common.base.Predicates.and;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToAttribute;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
@@ -27,6 +23,10 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInReferenc import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromAttribute;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java index 19feebab1..ca7cbc688 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,8 +10,8 @@ */
package org.eclipse.emf.compare.tests.diff;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import com.google.common.collect.Lists;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java index a1947ce21..b172370df 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EcorePackage;
import org.junit.Test;
+@SuppressWarnings("nls")
public class URIDistanceTest {
private URIDistance meter = new URIDistance();
@@ -141,14 +142,16 @@ public class URIDistanceTest { } else {
CharMatcher slash = CharMatcher.is('/');
Splitter splitter = Splitter.on('/');
- if (slash.indexIn(aPath) == 0) {
- aPath = aPath.substring(1);
+ String actualAPath = aPath;
+ String actualBPath = bPath;
+ if (slash.indexIn(actualAPath) == 0) {
+ actualAPath = aPath.substring(1);
}
- if (slash.indexIn(bPath) == 0) {
- bPath = bPath.substring(1);
+ if (slash.indexIn(actualBPath) == 0) {
+ actualBPath = bPath.substring(1);
}
- Iterable<String> aString = splitter.split(slash.trimTrailingFrom(aPath));
- Iterable<String> bString = splitter.split(slash.trimTrailingFrom(bPath));
+ Iterable<String> aString = splitter.split(slash.trimTrailingFrom(actualAPath));
+ Iterable<String> bString = splitter.split(slash.trimTrailingFrom(actualBPath));
return meter.proximity(ImmutableList.copyOf(aString), ImmutableList.copyOf(bString));
}
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/data/ecore/a1/EcoreA1InputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/data/ecore/a1/EcoreA1InputData.java index 7d071d95f..42c4bafee 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/data/ecore/a1/EcoreA1InputData.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/data/ecore/a1/EcoreA1InputData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ import org.eclipse.emf.compare.tests.edit.data.ResourceScopeProvider; import org.eclipse.emf.compare.tests.framework.AbstractInputData; import org.eclipse.emf.ecore.resource.Resource; +@SuppressWarnings("nls") public class EcoreA1InputData extends AbstractInputData implements ResourceScopeProvider { public Resource getLeft() throws IOException { diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java index b8e547844..f4f539bac 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,11 +10,11 @@ *******************************************************************************/
package org.eclipse.emf.compare.tests.equi;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java index a7cefcf62..b1d9152f3 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,11 +10,11 @@ */
package org.eclipse.emf.compare.tests.fragmentation;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import com.google.common.collect.Iterators;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java index 85cf3f750..132870db2 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/AbstractInputData.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -67,8 +67,6 @@ public abstract class AbstractInputData { * Thrown if we could not access either this class' resource, or the file towards which
* <code>path</code> points.
*/
- // Suppressing the warning until bug 376938 is fixed
- @SuppressWarnings("resource")
protected Resource loadFromClassLoader(String path, ResourceSet resourceSet) throws IOException {
final URL fileURL = getClass().getResource(path);
final URI uri = URI.createURI(fileURL.toString());
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/EMFCompareAssert.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/EMFCompareAssert.java index d9cc0962c..b9d0736d4 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/EMFCompareAssert.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/EMFCompareAssert.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,9 +11,6 @@ package org.eclipse.emf.compare.tests.framework;
import static com.google.common.base.Predicates.and;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;
@@ -21,6 +18,9 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReferenc import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/IdentifierMatchValidator.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/IdentifierMatchValidator.java index dfb33678a..48fda31d2 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/IdentifierMatchValidator.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/IdentifierMatchValidator.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,8 +10,8 @@ */
package org.eclipse.emf.compare.tests.framework;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import com.google.common.collect.Maps;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/EMFCompareTestRunner.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/EMFCompareTestRunner.java index cc0e42c4f..8c4d59edf 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/EMFCompareTestRunner.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/EMFCompareTestRunner.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2011, 2012 Obeo.
+ * Copyright (c) 2011, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,10 +13,9 @@ package org.eclipse.emf.compare.tests.framework.junit; import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
-
import org.eclipse.emf.compare.tests.framework.junit.annotation.UseCase;
import org.eclipse.emf.compare.tests.framework.junit.internal.UseCaseRunner;
+import org.junit.Assert;
import org.junit.runner.Description;
import org.junit.runner.Runner;
import org.junit.runner.notification.RunNotifier;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java index 70023cd7f..e80c4a62b 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2011, 2012 Obeo.
+ * Copyright (c) 2011, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,14 +14,13 @@ import com.google.common.collect.Lists; import java.util.List;
-import junit.framework.Assert;
-
import org.eclipse.emf.compare.tests.framework.NotifierTuple;
import org.eclipse.emf.compare.tests.framework.junit.annotation.BeforeMatch;
import org.eclipse.emf.compare.tests.framework.junit.annotation.ConflictTest;
import org.eclipse.emf.compare.tests.framework.junit.annotation.DiffTest;
import org.eclipse.emf.compare.tests.framework.junit.annotation.MatchTest;
import org.eclipse.emf.compare.tests.framework.junit.annotation.UseCase;
+import org.junit.Assert;
import org.junit.runners.BlockJUnit4ClassRunner;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.InitializationError;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseStatement.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseStatement.java index f6d867027..bede48da4 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseStatement.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseStatement.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,10 +10,9 @@ */
package org.eclipse.emf.compare.tests.framework.junit.internal;
-import junit.framework.Assert;
-
import org.eclipse.emf.compare.tests.framework.NotifierTuple;
import org.eclipse.emf.compare.tests.framework.junit.annotation.UseCase;
+import org.junit.Assert;
import org.junit.runners.model.FrameworkMethod;
/**
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java index a76565d2a..03885529d 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,13 +39,12 @@ import org.junit.runner.RunWith; * * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a> */ +@SuppressWarnings("nls") @RunWith(Theories.class) public class DistanceAxiomsTests { private DistanceFunction meter; - private int MAX_DISTANCE = Integer.MAX_VALUE; - private Comparison comparison; @Before @@ -63,7 +62,7 @@ public class DistanceAxiomsTests { Assume.assumeTrue(a.eClass() == b.eClass()); double aTob = meter.distance(comparison, a, b); double bToa = meter.distance(comparison, b, a); - assertEquals(aTob, bToa); + assertEquals(aTob, bToa, 0.01); } private static EObject[] createFingerPrintsFromModel(EObject einstance) { @@ -72,7 +71,7 @@ public class DistanceAxiomsTests { @Theory public void separation(EObject a) { - assertEquals(0, meter.distance(comparison, a, a)); + assertEquals(0, meter.distance(comparison, a, a), 0.01); } @Theory diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java index 7cd82148c..bee74c41e 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,14 +11,14 @@ package org.eclipse.emf.compare.tests.fullcomparison; import static com.google.common.base.Predicates.and; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference; import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute; import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference; import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide; import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java index 73b9b3fa0..30e90a56d 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,10 +10,6 @@ */
package org.eclipse.emf.compare.tests.fullcomparison;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.tests.framework.EMFCompareAssert.assertAdded;
import static org.eclipse.emf.compare.tests.framework.EMFCompareAssert.assertAddedToReference;
import static org.eclipse.emf.compare.tests.framework.EMFCompareAssert.assertAllMatched;
@@ -21,6 +17,10 @@ import static org.eclipse.emf.compare.tests.framework.EMFCompareAssert.assertCha import static org.eclipse.emf.compare.tests.framework.EMFCompareAssert.assertChangedReference;
import static org.eclipse.emf.compare.tests.framework.EMFCompareAssert.assertRemoved;
import static org.eclipse.emf.compare.tests.framework.EMFCompareAssert.assertRemovedFromReference;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import com.google.common.collect.Lists;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/MatchPerformanceComparisonTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/MatchPerformanceComparisonTest.java index b238307dc..e2efa3ca4 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/MatchPerformanceComparisonTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/MatchPerformanceComparisonTest.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,7 +28,6 @@ import org.eclipse.emf.compare.tests.suite.AllTests; import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.internal.resource.UMLResourceFactoryImpl;
import org.junit.Before;
import org.junit.Test;
@@ -49,13 +48,14 @@ public class MatchPerformanceComparisonTest { Resource origin;
+ @SuppressWarnings("restriction")
@Before
public void setUp() throws Exception {
AllTests.fillEMFRegistries();
EPackage.Registry.INSTANCE.put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("uml", //$NON-NLS-1$
- new UMLResourceFactoryImpl());
+ new org.eclipse.uml2.uml.internal.resource.UMLResourceFactoryImpl());
left = data.getNominalUMLLeft();
right = data.getNominalUMLRight();
origin = data.getNominalUMLOrigin();
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ProximityComparisonTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ProximityComparisonTest.java index 5a7c8ff4f..8744ddf50 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ProximityComparisonTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ProximityComparisonTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,16 +10,14 @@ */ package org.eclipse.emf.compare.tests.fullcomparison; -import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; import java.util.Iterator; import java.util.List; @@ -141,11 +139,6 @@ public class ProximityComparisonTest extends EMFCompareTestBase { Comparison result = EMFCompare.builder().setMatchEngineFactoryRegistry(matchEngineFactoryRegistry) .build().compare(scope); EMFComparePrettyPrinter.printComparison(result, System.out); - final List<Diff> differences = result.getDifferences(); - // EMFCompareAssert.assertAddedToReference(differences, "p1.p2", "eSubpackages", "p1.p2.subPackage", - // DifferenceSource.LEFT); - // EMFCompareAssert.assertRemovedFromReference(differences, "p1", "eSubpackages", "p1.another", - // DifferenceSource.LEFT); assertEquals("We are supposed to have zero diffs", 2, result.getDifferences().size()); } @@ -189,7 +182,6 @@ public class ProximityComparisonTest extends EMFCompareTestBase { Iterator<ResourceAttachmentChange> attrChanges = Iterators.filter(result.getDifferences().iterator(), ResourceAttachmentChange.class); assertTrue("We are supposed to detect a new attachment to a resource", attrChanges.hasNext()); - } @Test @@ -214,13 +206,6 @@ public class ProximityComparisonTest extends EMFCompareTestBase { } - private String print(Comparison result) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - PrintStream ps = new PrintStream(baos); - EMFComparePrettyPrinter.printDifferences(result, ps); - return baos.toString(); - } - private void assertAllMatched(Iterable<? extends EObject> eObjects, Comparison comparison) { for (EObject eObject : eObjects) { final Match match = comparison.getMatch(eObject); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java index f3bdeb28c..9befeca51 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/distance/DistanceMatchInputData.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@ import java.io.IOException; import org.eclipse.emf.compare.tests.framework.AbstractInputData;
import org.eclipse.emf.ecore.resource.Resource;
+@SuppressWarnings("nls")
public class DistanceMatchInputData extends AbstractInputData {
public Resource getCompareLeft() throws IOException {
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/dynamic/DynamicInstancesInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/dynamic/DynamicInstancesInputData.java index 15b2182c7..2d9e579db 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/dynamic/DynamicInstancesInputData.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/data/dynamic/DynamicInstancesInputData.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+@SuppressWarnings({"nls", "unchecked", })
public class DynamicInstancesInputData extends AbstractInputData {
private EPackage pak;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/MatchEngineFactoryRegistryTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/MatchEngineFactoryRegistryTest.java index 4d2e5ef1c..703d30116 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/MatchEngineFactoryRegistryTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/MatchEngineFactoryRegistryTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.match; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/ProximityIndexTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/ProximityIndexTest.java index 8fcebb08b..1628d676e 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/ProximityIndexTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/ProximityIndexTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,6 +30,7 @@ import org.junit.Test; * * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a> */ +@SuppressWarnings("nls") public class ProximityIndexTest { @Test diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java index 750ebfcf6..76cad4282 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,12 +11,12 @@ package org.eclipse.emf.compare.tests.merge;
import static com.google.common.base.Predicates.and;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import com.google.common.collect.Iterators;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java index 93ad35bca..fb653cbe2 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,12 +10,12 @@ *******************************************************************************/
package org.eclipse.emf.compare.tests.merge;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.Iterator;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java index ac7ddd79c..d73baba3b 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,12 +11,6 @@ package org.eclipse.emf.compare.tests.merge;
import static com.google.common.base.Predicates.and;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToAttribute;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;
@@ -26,6 +20,12 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInAttribut import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromAttribute;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import com.google.common.collect.Iterators;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java index 539b01612..9a67eab3a 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,11 +11,6 @@ package org.eclipse.emf.compare.tests.merge;
import static com.google.common.base.Predicates.and;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
@@ -23,6 +18,11 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide; import static org.eclipse.emf.compare.utils.EMFComparePredicates.moved;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java index 790c17bf5..5a080404a 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.emf.compare.tests.postprocess; -import static junit.framework.Assert.assertSame; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -203,7 +203,7 @@ public class PostProcessorTest { final Resource right = input.getRight(); final IComparisonScope scope = new DefaultComparisonScope(left, right, null); - PostProcessorDescriptorRegistryImpl registry = new PostProcessorDescriptorRegistryImpl(); + PostProcessorDescriptorRegistryImpl<String> registry = new PostProcessorDescriptorRegistryImpl<String>(); registry.put(TestPostProcessor1.class.getName(), new TestPostProcessorDescriptor(Pattern.compile(""), null, new TestPostProcessor1(), 1)); registry.put(TestPostProcessor2.class.getName(), new TestPostProcessorDescriptor(Pattern @@ -230,7 +230,7 @@ public class PostProcessorTest { private Comparison compareWithPostProcessing(Resource left, Resource right, Pattern nsURI, Pattern resourceURI) { - PostProcessorDescriptorRegistryImpl registry = new PostProcessorDescriptorRegistryImpl(); + PostProcessorDescriptorRegistryImpl<String> registry = new PostProcessorDescriptorRegistryImpl<String>(); registry.put(TestPostProcessor.class.getName(), new TestPostProcessorDescriptor(nsURI, resourceURI, new TestPostProcessor(), 10)); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java index 51cd59067..2115d0f57 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,14 +12,14 @@ package org.eclipse.emf.compare.tests.req; import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.getOnlyElement;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertSame;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
@@ -624,7 +624,7 @@ public class ReqComputingTest { EList<Diff> differences = comparison.getDifferences();
- assertSame(3, differences.size());
+ assertSame(Integer.valueOf(3), Integer.valueOf(differences.size()));
Diff added1 = getOnlyElement(filter(differences, added(node1)), null);
assertNotNull(added1);
Diff added2 = getOnlyElement(filter(differences, added(node2)), null);
@@ -641,10 +641,10 @@ public class ReqComputingTest { // Happy compiler
assert singleChange != null;
assertTrue(singleChange.getValue().eIsProxy());
- assertSame(0, added1.getRequires().size());
- assertSame(1, added2.getRequires().size());
+ assertSame(Integer.valueOf(0), Integer.valueOf(added1.getRequires().size()));
+ assertSame(Integer.valueOf(1), Integer.valueOf(added2.getRequires().size()));
assertTrue(added2.getRequires().contains(added1));
- assertSame(1, singleChange.getRequires().size());
+ assertSame(Integer.valueOf(1), Integer.valueOf(singleChange.getRequires().size()));
assertTrue(singleChange.getRequires().contains(added2));
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/scope/DefaultComparisonScopeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/scope/DefaultComparisonScopeTest.java index 1b3349bb7..2cf2cc0cf 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/scope/DefaultComparisonScopeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/scope/DefaultComparisonScopeTest.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,11 +10,11 @@ *******************************************************************************/
package org.eclipse.emf.compare.tests.scope;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF index 9c9a106d8..8eaaf587f 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.uml2.edit;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.compare.uml2.internal.provider.UMLCompareEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml index 335bdbff6..f297b1ec3 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2.edit</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF index edbab9b9b..3103102fe 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.uml2.rcp.ui;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.emf.compare.uml2.edit;bundle-version="2.0.1", diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml index b6fc4c891..7bdf24006 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2.rcp.ui</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.rcp/META-INF/MANIFEST.MF index f2c6517f5..6036d8ff6 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.uml2.rcp;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.compare.rcp;bundle-version="2.1.0", org.eclipse.emf.ecore, diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml index 446b27f87..a3a7362f2 100644 --- a/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.rcp/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2.rcp</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF index 4af25d4a1..442efd43a 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.uml2.tests;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml index 708d5f8f4..13e033ea6 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2.tests/pom.xml @@ -5,12 +5,12 @@ <parent>
<artifactId>emf.compare-parent</artifactId>
<groupId>org.eclipse.emf.compare</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../org.eclipse.emf.compare-parent</relativePath>
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.uml2.tests</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF index ac1264c10..37177ece8 100644 --- a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.uml2;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.compare.uml2/pom.xml b/plugins/org.eclipse.emf.compare.uml2/pom.xml index 80034cb56..fceb813c6 100644 --- a/plugins/org.eclipse.emf.compare.uml2/pom.xml +++ b/plugins/org.eclipse.emf.compare.uml2/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare.uml2</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java index ae83d0146..8f4ee7fa3 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ package org.eclipse.emf.compare.uml2.internal; import org.eclipse.emf.compare.ComparePackage; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; @@ -2137,6 +2136,8 @@ public interface UMLComparePackage extends EPackage { * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("hiding") + // generated code, removing warnings interface Literals { /** * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl <em>Association Change</em>}' class. diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java index a4a686ffe..a5539c935 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,6 @@ */ package org.eclipse.emf.compare.uml2.internal.impl; -import org.eclipse.emf.compare.uml2.internal.*; import org.eclipse.emf.compare.uml2.internal.AssociationChange; import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange; import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange; diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java index 365c3465d..bf6ddc36a 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.compare.Diff; -import org.eclipse.emf.compare.uml2.internal.*; import org.eclipse.emf.compare.uml2.internal.AssociationChange; import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange; import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange; @@ -33,20 +32,21 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter * <code>createXXX</code> method for each class of the model. <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage * @generated */ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected static UMLComparePackage modelPackage; /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public UMLCompareAdapterFactory() { @@ -56,10 +56,10 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> This + * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This * implementation returns <code>true</code> if the object is either the model's package or is an instance * object of the model. <!-- end-user-doc --> + * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -75,74 +75,88 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * The switch that delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> <!-- + * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated */ protected UMLCompareSwitch<Adapter> modelSwitch = new UMLCompareSwitch<Adapter>() { - @Override - public Adapter caseAssociationChange(AssociationChange object) { - return createAssociationChangeAdapter(); - } - @Override - public Adapter caseExtendChange(ExtendChange object) { - return createExtendChangeAdapter(); - } - @Override - public Adapter caseGeneralizationSetChange(GeneralizationSetChange object) { - return createGeneralizationSetChangeAdapter(); - } - @Override - public Adapter caseExecutionSpecificationChange(ExecutionSpecificationChange object) { - return createExecutionSpecificationChangeAdapter(); - } - @Override - public Adapter caseIntervalConstraintChange(IntervalConstraintChange object) { - return createIntervalConstraintChangeAdapter(); - } - @Override - public Adapter caseMessageChange(MessageChange object) { - return createMessageChangeAdapter(); - } - @Override - public Adapter caseStereotypePropertyChange(StereotypePropertyChange object) { - return createStereotypePropertyChangeAdapter(); - } - @Override - public Adapter caseStereotypeApplicationChange(StereotypeApplicationChange object) { - return createStereotypeApplicationChangeAdapter(); - } - @Override - public Adapter caseStereotypeReferenceChange(StereotypeReferenceChange object) { - return createStereotypeReferenceChangeAdapter(); - } - @Override - public Adapter caseProfileApplicationChange(ProfileApplicationChange object) { - return createProfileApplicationChangeAdapter(); - } - @Override - public Adapter caseDirectedRelationshipChange(DirectedRelationshipChange object) { - return createDirectedRelationshipChangeAdapter(); - } - @Override - public Adapter caseUMLDiff(UMLDiff object) { - return createUMLDiffAdapter(); - } - @Override - public Adapter caseDiff(Diff object) { - return createDiffAdapter(); - } - @Override - public Adapter defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; + @Override + public Adapter caseAssociationChange(AssociationChange object) { + return createAssociationChangeAdapter(); + } + + @Override + public Adapter caseExtendChange(ExtendChange object) { + return createExtendChangeAdapter(); + } + + @Override + public Adapter caseGeneralizationSetChange(GeneralizationSetChange object) { + return createGeneralizationSetChangeAdapter(); + } + + @Override + public Adapter caseExecutionSpecificationChange(ExecutionSpecificationChange object) { + return createExecutionSpecificationChangeAdapter(); + } + + @Override + public Adapter caseIntervalConstraintChange(IntervalConstraintChange object) { + return createIntervalConstraintChangeAdapter(); + } + + @Override + public Adapter caseMessageChange(MessageChange object) { + return createMessageChangeAdapter(); + } + + @Override + public Adapter caseStereotypePropertyChange(StereotypePropertyChange object) { + return createStereotypePropertyChangeAdapter(); + } + + @Override + public Adapter caseStereotypeApplicationChange(StereotypeApplicationChange object) { + return createStereotypeApplicationChangeAdapter(); + } + + @Override + public Adapter caseStereotypeReferenceChange(StereotypeReferenceChange object) { + return createStereotypeReferenceChangeAdapter(); + } + + @Override + public Adapter caseProfileApplicationChange(ProfileApplicationChange object) { + return createProfileApplicationChangeAdapter(); + } + + @Override + public Adapter caseDirectedRelationshipChange(DirectedRelationshipChange object) { + return createDirectedRelationshipChangeAdapter(); + } + + @Override + public Adapter caseUMLDiff(UMLDiff object) { + return createUMLDiffAdapter(); + } + + @Override + public Adapter caseDiff(Diff object) { + return createDiffAdapter(); + } + + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param target the object to adapt. + * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param target + * the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -166,10 +180,11 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ExtendChange <em>Extend Change</em>}'. - * <!-- begin-user-doc + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.ExtendChange <em>Extend Change</em>}'. <!-- begin-user-doc * --> This default implementation returns null so that we can easily ignore cases; it's useful to ignore * a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.ExtendChange * @generated @@ -179,10 +194,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange <em>Generalization Set Change</em>}'. - * <!-- begin-user-doc --> This default implementation returns null + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange + * <em>Generalization Set Change</em>}'. <!-- begin-user-doc --> This default implementation returns null * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the * cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange * @generated @@ -192,10 +209,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange <em>Execution Specification Change</em>}'. - * <!-- begin-user-doc --> This default implementation returns + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange + * <em>Execution Specification Change</em>}'. <!-- begin-user-doc --> This default implementation returns * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all * the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange * @generated @@ -205,10 +224,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange <em>Interval Constraint Change</em>}'. - * <!-- begin-user-doc --> This default implementation returns null + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange + * <em>Interval Constraint Change</em>}'. <!-- begin-user-doc --> This default implementation returns null * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the * cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange * @generated @@ -232,10 +253,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange <em>Stereotype Property Change</em>}'. - * <!-- begin-user-doc --> This default implementation returns null + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange + * <em>Stereotype Property Change</em>}'. <!-- begin-user-doc --> This default implementation returns null * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the * cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange * @generated @@ -245,10 +268,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange <em>Stereotype Application Change</em>}'. - * <!-- begin-user-doc --> This default implementation returns + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange + * <em>Stereotype Application Change</em>}'. <!-- begin-user-doc --> This default implementation returns * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all * the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange * @generated @@ -258,10 +283,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange <em>Stereotype Reference Change</em>}'. - * <!-- begin-user-doc --> This default implementation returns + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange + * <em>Stereotype Reference Change</em>}'. <!-- begin-user-doc --> This default implementation returns * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all * the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange * @generated @@ -271,10 +298,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange <em>Profile Application Change</em>}'. - * <!-- begin-user-doc --> This default implementation returns null + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange + * <em>Profile Application Change</em>}'. <!-- begin-user-doc --> This default implementation returns null * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the * cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange * @generated @@ -284,10 +313,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange <em>Directed Relationship Change</em>}'. - * <!-- begin-user-doc --> This default implementation returns + * Creates a new adapter for an object of class ' + * {@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange + * <em>Directed Relationship Change</em>}'. <!-- begin-user-doc --> This default implementation returns * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all * the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange * @generated @@ -297,10 +328,11 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff <em>UML Diff</em>}'. - * <!-- begin-user-doc --> This default implementation returns null so that we can + * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff + * <em>UML Diff</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.compare.uml2.internal.UMLDiff * @generated @@ -323,9 +355,9 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> This default implementation returns + * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns * null. <!-- end-user-doc --> + * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java index 8409db88e..e16264d7b 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.emf.compare.uml2.internal.util; import java.util.List; import org.eclipse.emf.compare.Diff; -import org.eclipse.emf.compare.uml2.internal.*; import org.eclipse.emf.compare.uml2.internal.AssociationChange; import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange; import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange; diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/UMLPostProcessor.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/UMLPostProcessor.java index e55feda7d..5b8042a50 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/UMLPostProcessor.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/UMLPostProcessor.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -258,7 +258,7 @@ public class UMLPostProcessor implements IPostProcessor { final Class<?> classDiffElement = umlDiff.eClass().getInstanceClass();
final IChangeFactory diffFactory = mapUml2ExtensionFactories.get(classDiffElement);
if (diffFactory != null) {
- diffFactory.fillRequiredDifferences(comparison, (UMLDiff)umlDiff);
+ diffFactory.fillRequiredDifferences(comparison, umlDiff);
}
}
}
diff --git a/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF index ec62c4c19..fa8d7441f 100644 --- a/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -15,15 +15,16 @@ Export-Package: org.eclipse.emf.compare, org.eclipse.emf.compare.internal;x-friends:="org.eclipse.emf.compare.logical,org.eclipse.emf.compare.ide", org.eclipse.emf.compare.internal.merge;x-friends:="org.eclipse.emf.compare.rcp.ui,org.eclipse.emf.compare.edit,org.eclipse.emf.compare.ide.ui", org.eclipse.emf.compare.internal.postprocessor.factories;x-internal:=true, - org.eclipse.emf.compare.internal.spec;x-friends:="org.eclipse.emf.compare.tests", + org.eclipse.emf.compare.internal.spec;x-friends:="org.eclipse.emf.compare.tests,org.eclipse.emf.compare.rcp.ui", org.eclipse.emf.compare.internal.utils; x-friends:="org.eclipse.emf.compare.ide.ui, org.eclipse.emf.compare.tests, org.eclipse.emf.compare.uml2, - org.eclipse.emf.compare.diagram.ide.ui", + org.eclipse.emf.compare.diagram.ide.ui, + org.eclipse.emf.compare.rcp.ui", org.eclipse.emf.compare.match, org.eclipse.emf.compare.match.eobject, - org.eclipse.emf.compare.match.eobject.internal;x-internal:=true, + org.eclipse.emf.compare.match.eobject.internal;x-friends:="org.eclipse.emf.compare.tests", org.eclipse.emf.compare.match.impl, org.eclipse.emf.compare.match.resource, org.eclipse.emf.compare.merge, diff --git a/plugins/org.eclipse.emf.compare/pom.xml b/plugins/org.eclipse.emf.compare/pom.xml index 26850f4ee..55ca3801b 100644 --- a/plugins/org.eclipse.emf.compare/pom.xml +++ b/plugins/org.eclipse.emf.compare/pom.xml @@ -5,12 +5,12 @@ <parent> <artifactId>emf.compare-parent</artifactId> <groupId>org.eclipse.emf.compare</groupId> - <version>2.2.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../org.eclipse.emf.compare-parent</relativePath> </parent> <groupId>org.eclipse.emf.compare</groupId> <artifactId>org.eclipse.emf.compare</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>4.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/ComparePackage.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/ComparePackage.java index ad37fd2fc..4c1cb04bc 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/ComparePackage.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/ComparePackage.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.CompareFactory * @model kind="package" * @generated @@ -34,41 +35,43 @@ import org.eclipse.emf.ecore.EReference; public interface ComparePackage extends EPackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$ /** - * The package name. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ String eNAME = "compare"; //$NON-NLS-1$ /** - * The package namespace URI. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ String eNS_URI = "http://www.eclipse.org/emf/compare"; //$NON-NLS-1$ /** - * The package namespace name. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ String eNS_PREFIX = "compare"; //$NON-NLS-1$ /** - * The singleton instance of the package. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ ComparePackage eINSTANCE = org.eclipse.emf.compare.impl.ComparePackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.compare.impl.ComparisonImpl <em>Comparison</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.impl.ComparisonImpl <em>Comparison</em>}' + * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.ComparisonImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getComparison() * @generated @@ -85,27 +88,27 @@ public interface ComparePackage extends EPackage { int COMPARISON__MATCHED_RESOURCES = 0; /** - * The feature id for the '<em><b>Matches</b></em>' containment reference list. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Matches</b></em>' containment reference list. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated * @ordered */ int COMPARISON__MATCHES = 1; /** - * The feature id for the '<em><b>Conflicts</b></em>' containment reference list. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Conflicts</b></em>' containment reference list. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated * @ordered */ int COMPARISON__CONFLICTS = 2; /** - * The feature id for the '<em><b>Equivalences</b></em>' containment reference list. - * <!-- begin-user-doc + * The feature id for the '<em><b>Equivalences</b></em>' containment reference list. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -121,26 +124,28 @@ public interface ComparePackage extends EPackage { int COMPARISON__THREE_WAY = 4; /** - * The feature id for the '<em><b>Diagnostic</b></em>' attribute. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Diagnostic</b></em>' attribute. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int COMPARISON__DIAGNOSTIC = 5; /** - * The number of structural features of the '<em>Comparison</em>' class. - * <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Comparison</em>' class. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int COMPARISON_FEATURE_COUNT = 6; /** - * The meta object id for the '{@link org.eclipse.emf.compare.impl.MatchResourceImpl <em>Match Resource</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.impl.MatchResourceImpl + * <em>Match Resource</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.MatchResourceImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getMatchResource() * @generated @@ -166,25 +171,25 @@ public interface ComparePackage extends EPackage { int MATCH_RESOURCE__RIGHT_URI = 1; /** - * The feature id for the '<em><b>Origin URI</b></em>' attribute. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Origin URI</b></em>' attribute. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int MATCH_RESOURCE__ORIGIN_URI = 2; /** - * The feature id for the '<em><b>Left</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Left</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int MATCH_RESOURCE__LEFT = 3; /** - * The feature id for the '<em><b>Right</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Right</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -200,18 +205,18 @@ public interface ComparePackage extends EPackage { int MATCH_RESOURCE__ORIGIN = 5; /** - * The feature id for the '<em><b>Comparison</b></em>' container reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Comparison</b></em>' container reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int MATCH_RESOURCE__COMPARISON = 6; /** - * The number of structural features of the '<em>Match Resource</em>' class. - * <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Match Resource</em>' class. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ @@ -228,34 +233,34 @@ public interface ComparePackage extends EPackage { int MATCH = 2; /** - * The feature id for the '<em><b>Submatches</b></em>' containment reference list. - * <!-- begin-user-doc --> + * The feature id for the '<em><b>Submatches</b></em>' containment reference list. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated * @ordered */ int MATCH__SUBMATCHES = 0; /** - * The feature id for the '<em><b>Differences</b></em>' containment reference list. - * <!-- begin-user-doc + * The feature id for the '<em><b>Differences</b></em>' containment reference list. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated * @ordered */ int MATCH__DIFFERENCES = 1; /** - * The feature id for the '<em><b>Left</b></em>' reference. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Left</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int MATCH__LEFT = 2; /** - * The feature id for the '<em><b>Right</b></em>' reference. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Right</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -271,9 +276,9 @@ public interface ComparePackage extends EPackage { int MATCH__ORIGIN = 4; /** - * The number of structural features of the '<em>Match</em>' class. - * <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Match</em>' class. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ @@ -290,80 +295,83 @@ public interface ComparePackage extends EPackage { int DIFF = 3; /** - * The feature id for the '<em><b>Match</b></em>' container reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int DIFF__MATCH = 0; /** - * The feature id for the '<em><b>Requires</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int DIFF__REQUIRES = 1; /** - * The feature id for the '<em><b>Required By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int DIFF__REQUIRED_BY = 2; /** - * The feature id for the '<em><b>Implies</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int DIFF__IMPLIES = 3; /** - * The feature id for the '<em><b>Implied By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int DIFF__IMPLIED_BY = 4; /** - * The feature id for the '<em><b>Refines</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int DIFF__REFINES = 5; /** - * The feature id for the '<em><b>Refined By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int DIFF__REFINED_BY = 6; /** - * The feature id for the '<em><b>Prime Refining</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int DIFF__PRIME_REFINING = 7; /** - * The feature id for the '<em><b>Kind</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -379,17 +387,17 @@ public interface ComparePackage extends EPackage { int DIFF__SOURCE = 9; /** - * The feature id for the '<em><b>State</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int DIFF__STATE = 10; /** - * The feature id for the '<em><b>Equivalence</b></em>' reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ @@ -405,17 +413,18 @@ public interface ComparePackage extends EPackage { int DIFF__CONFLICT = 12; /** - * The number of structural features of the '<em>Diff</em>' class. - * <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Diff</em>' class. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int DIFF_FEATURE_COUNT = 13; /** - * The meta object id for the '{@link org.eclipse.emf.compare.impl.ResourceAttachmentChangeImpl <em>Resource Attachment Change</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.impl.ResourceAttachmentChangeImpl + * <em>Resource Attachment Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.ResourceAttachmentChangeImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getResourceAttachmentChange() * @generated @@ -423,80 +432,83 @@ public interface ComparePackage extends EPackage { int RESOURCE_ATTACHMENT_CHANGE = 4; /** - * The feature id for the '<em><b>Match</b></em>' container reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int RESOURCE_ATTACHMENT_CHANGE__MATCH = DIFF__MATCH; /** - * The feature id for the '<em><b>Requires</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int RESOURCE_ATTACHMENT_CHANGE__REQUIRES = DIFF__REQUIRES; /** - * The feature id for the '<em><b>Required By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int RESOURCE_ATTACHMENT_CHANGE__REQUIRED_BY = DIFF__REQUIRED_BY; /** - * The feature id for the '<em><b>Implies</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int RESOURCE_ATTACHMENT_CHANGE__IMPLIES = DIFF__IMPLIES; /** - * The feature id for the '<em><b>Implied By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int RESOURCE_ATTACHMENT_CHANGE__IMPLIED_BY = DIFF__IMPLIED_BY; /** - * The feature id for the '<em><b>Refines</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int RESOURCE_ATTACHMENT_CHANGE__REFINES = DIFF__REFINES; /** - * The feature id for the '<em><b>Refined By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int RESOURCE_ATTACHMENT_CHANGE__REFINED_BY = DIFF__REFINED_BY; /** - * The feature id for the '<em><b>Prime Refining</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int RESOURCE_ATTACHMENT_CHANGE__PRIME_REFINING = DIFF__PRIME_REFINING; /** - * The feature id for the '<em><b>Kind</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -512,17 +524,17 @@ public interface ComparePackage extends EPackage { int RESOURCE_ATTACHMENT_CHANGE__SOURCE = DIFF__SOURCE; /** - * The feature id for the '<em><b>State</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int RESOURCE_ATTACHMENT_CHANGE__STATE = DIFF__STATE; /** - * The feature id for the '<em><b>Equivalence</b></em>' reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ @@ -538,9 +550,9 @@ public interface ComparePackage extends EPackage { int RESOURCE_ATTACHMENT_CHANGE__CONFLICT = DIFF__CONFLICT; /** - * The feature id for the '<em><b>Resource URI</b></em>' attribute. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Resource URI</b></em>' attribute. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ @@ -556,8 +568,9 @@ public interface ComparePackage extends EPackage { int RESOURCE_ATTACHMENT_CHANGE_FEATURE_COUNT = DIFF_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.compare.impl.ReferenceChangeImpl <em>Reference Change</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.impl.ReferenceChangeImpl + * <em>Reference Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.ReferenceChangeImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getReferenceChange() * @generated @@ -565,80 +578,83 @@ public interface ComparePackage extends EPackage { int REFERENCE_CHANGE = 5; /** - * The feature id for the '<em><b>Match</b></em>' container reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int REFERENCE_CHANGE__MATCH = DIFF__MATCH; /** - * The feature id for the '<em><b>Requires</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int REFERENCE_CHANGE__REQUIRES = DIFF__REQUIRES; /** - * The feature id for the '<em><b>Required By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int REFERENCE_CHANGE__REQUIRED_BY = DIFF__REQUIRED_BY; /** - * The feature id for the '<em><b>Implies</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int REFERENCE_CHANGE__IMPLIES = DIFF__IMPLIES; /** - * The feature id for the '<em><b>Implied By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int REFERENCE_CHANGE__IMPLIED_BY = DIFF__IMPLIED_BY; /** - * The feature id for the '<em><b>Refines</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int REFERENCE_CHANGE__REFINES = DIFF__REFINES; /** - * The feature id for the '<em><b>Refined By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int REFERENCE_CHANGE__REFINED_BY = DIFF__REFINED_BY; /** - * The feature id for the '<em><b>Prime Refining</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int REFERENCE_CHANGE__PRIME_REFINING = DIFF__PRIME_REFINING; /** - * The feature id for the '<em><b>Kind</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -654,17 +670,17 @@ public interface ComparePackage extends EPackage { int REFERENCE_CHANGE__SOURCE = DIFF__SOURCE; /** - * The feature id for the '<em><b>State</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int REFERENCE_CHANGE__STATE = DIFF__STATE; /** - * The feature id for the '<em><b>Equivalence</b></em>' reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ @@ -689,25 +705,26 @@ public interface ComparePackage extends EPackage { int REFERENCE_CHANGE__REFERENCE = DIFF_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Value</b></em>' reference. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int REFERENCE_CHANGE__VALUE = DIFF_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Reference Change</em>' class. - * <!-- begin-user-doc --> + * The number of structural features of the '<em>Reference Change</em>' class. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated * @ordered */ int REFERENCE_CHANGE_FEATURE_COUNT = DIFF_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.emf.compare.impl.AttributeChangeImpl <em>Attribute Change</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.impl.AttributeChangeImpl + * <em>Attribute Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.AttributeChangeImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getAttributeChange() * @generated @@ -715,80 +732,83 @@ public interface ComparePackage extends EPackage { int ATTRIBUTE_CHANGE = 6; /** - * The feature id for the '<em><b>Match</b></em>' container reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int ATTRIBUTE_CHANGE__MATCH = DIFF__MATCH; /** - * The feature id for the '<em><b>Requires</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int ATTRIBUTE_CHANGE__REQUIRES = DIFF__REQUIRES; /** - * The feature id for the '<em><b>Required By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int ATTRIBUTE_CHANGE__REQUIRED_BY = DIFF__REQUIRED_BY; /** - * The feature id for the '<em><b>Implies</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int ATTRIBUTE_CHANGE__IMPLIES = DIFF__IMPLIES; /** - * The feature id for the '<em><b>Implied By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int ATTRIBUTE_CHANGE__IMPLIED_BY = DIFF__IMPLIED_BY; /** - * The feature id for the '<em><b>Refines</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int ATTRIBUTE_CHANGE__REFINES = DIFF__REFINES; /** - * The feature id for the '<em><b>Refined By</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int ATTRIBUTE_CHANGE__REFINED_BY = DIFF__REFINED_BY; /** - * The feature id for the '<em><b>Prime Refining</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * * @generated * @ordered + * @since 4.0 */ int ATTRIBUTE_CHANGE__PRIME_REFINING = DIFF__PRIME_REFINING; /** - * The feature id for the '<em><b>Kind</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ @@ -804,17 +824,17 @@ public interface ComparePackage extends EPackage { int ATTRIBUTE_CHANGE__SOURCE = DIFF__SOURCE; /** - * The feature id for the '<em><b>State</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int ATTRIBUTE_CHANGE__STATE = DIFF__STATE; /** - * The feature id for the '<em><b>Equivalence</b></em>' reference. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ @@ -839,17 +859,17 @@ public interface ComparePackage extends EPackage { int ATTRIBUTE_CHANGE__ATTRIBUTE = DIFF_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Value</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Value</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int ATTRIBUTE_CHANGE__VALUE = DIFF_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Attribute Change</em>' class. - * <!-- begin-user-doc --> + * The number of structural features of the '<em>Attribute Change</em>' class. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated * @ordered */ @@ -858,6 +878,7 @@ public interface ComparePackage extends EPackage { /** * The meta object id for the '{@link org.eclipse.emf.compare.impl.ConflictImpl <em>Conflict</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.ConflictImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getConflict() * @generated @@ -865,34 +886,35 @@ public interface ComparePackage extends EPackage { int CONFLICT = 7; /** - * The feature id for the '<em><b>Kind</b></em>' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated * @ordered */ int CONFLICT__KIND = 0; /** - * The feature id for the '<em><b>Differences</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Differences</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int CONFLICT__DIFFERENCES = 1; /** - * The number of structural features of the '<em>Conflict</em>' class. - * <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Conflict</em>' class. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int CONFLICT_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.emf.compare.impl.EquivalenceImpl <em>Equivalence</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.impl.EquivalenceImpl <em>Equivalence</em>}' + * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.EquivalenceImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getEquivalence() * @generated @@ -900,26 +922,27 @@ public interface ComparePackage extends EPackage { int EQUIVALENCE = 8; /** - * The feature id for the '<em><b>Differences</b></em>' reference list. - * <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Differences</b></em>' reference list. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int EQUIVALENCE__DIFFERENCES = 0; /** - * The number of structural features of the '<em>Equivalence</em>' class. - * <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Equivalence</em>' class. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @generated * @ordered */ int EQUIVALENCE_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.emf.compare.DifferenceKind <em>Difference Kind</em>}' enum. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.DifferenceKind <em>Difference Kind</em>}' + * enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.DifferenceKind * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDifferenceKind() * @generated @@ -927,8 +950,9 @@ public interface ComparePackage extends EPackage { int DIFFERENCE_KIND = 9; /** - * The meta object id for the '{@link org.eclipse.emf.compare.DifferenceSource <em>Difference Source</em>}' enum. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.DifferenceSource <em>Difference Source</em>} + * ' enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.DifferenceSource * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDifferenceSource() * @generated @@ -936,8 +960,9 @@ public interface ComparePackage extends EPackage { int DIFFERENCE_SOURCE = 10; /** - * The meta object id for the '{@link org.eclipse.emf.compare.DifferenceState <em>Difference State</em>}' enum. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.compare.DifferenceState <em>Difference State</em>}' + * enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.DifferenceState * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDifferenceState() * @generated @@ -947,6 +972,7 @@ public interface ComparePackage extends EPackage { /** * The meta object id for the '{@link org.eclipse.emf.compare.ConflictKind <em>Conflict Kind</em>}' enum. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.ConflictKind * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getConflictKind() * @generated @@ -964,9 +990,9 @@ public interface ComparePackage extends EPackage { int EITERABLE = 13; /** - * The meta object id for the '<em>IEquality Helper</em>' data type. - * <!-- begin-user-doc --> <!-- + * The meta object id for the '<em>IEquality Helper</em>' data type. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @see org.eclipse.emf.compare.utils.IEqualityHelper * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getIEqualityHelper() * @generated @@ -980,12 +1006,14 @@ public interface ComparePackage extends EPackage { * @see org.eclipse.emf.common.util.Diagnostic * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDiagnostic() * @generated + * @since 4.0 */ int DIAGNOSTIC = 15; /** * Returns the meta object for class '{@link org.eclipse.emf.compare.Comparison <em>Comparison</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for class '<em>Comparison</em>'. * @see org.eclipse.emf.compare.Comparison * @generated @@ -1005,9 +1033,10 @@ public interface ComparePackage extends EPackage { EReference getComparison_MatchedResources(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.compare.Comparison#getMatches <em>Matches</em>}'. - * <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.compare.Comparison#getMatches <em>Matches</em>}'. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @return the meta object for the containment reference list '<em>Matches</em>'. * @see org.eclipse.emf.compare.Comparison#getMatches() * @see #getComparison() @@ -1016,9 +1045,10 @@ public interface ComparePackage extends EPackage { EReference getComparison_Matches(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.compare.Comparison#getConflicts <em>Conflicts</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.compare.Comparison#getConflicts <em>Conflicts</em>}'. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @return the meta object for the containment reference list '<em>Conflicts</em>'. * @see org.eclipse.emf.compare.Comparison#getConflicts() * @see #getComparison() @@ -1027,9 +1057,10 @@ public interface ComparePackage extends EPackage { EReference getComparison_Conflicts(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.compare.Comparison#getEquivalences <em>Equivalences</em>}'. - * <!-- begin-user-doc + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.compare.Comparison#getEquivalences <em>Equivalences</em>}'. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @return the meta object for the containment reference list '<em>Equivalences</em>'. * @see org.eclipse.emf.compare.Comparison#getEquivalences() * @see #getComparison() @@ -1038,8 +1069,9 @@ public interface ComparePackage extends EPackage { EReference getComparison_Equivalences(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Comparison#isThreeWay <em>Three Way</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Comparison#isThreeWay + * <em>Three Way</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Three Way</em>'. * @see org.eclipse.emf.compare.Comparison#isThreeWay() * @see #getComparison() @@ -1048,18 +1080,21 @@ public interface ComparePackage extends EPackage { EAttribute getComparison_ThreeWay(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Comparison#getDiagnostic <em>Diagnostic</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Comparison#getDiagnostic + * <em>Diagnostic</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Diagnostic</em>'. * @see org.eclipse.emf.compare.Comparison#getDiagnostic() * @see #getComparison() * @generated + * @since 4.0 */ EAttribute getComparison_Diagnostic(); /** - * Returns the meta object for class '{@link org.eclipse.emf.compare.MatchResource <em>Match Resource</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.compare.MatchResource + * <em>Match Resource</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for class '<em>Match Resource</em>'. * @see org.eclipse.emf.compare.MatchResource * @generated @@ -1067,8 +1102,9 @@ public interface ComparePackage extends EPackage { EClass getMatchResource(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getLeftURI <em>Left URI</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getLeftURI + * <em>Left URI</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Left URI</em>'. * @see org.eclipse.emf.compare.MatchResource#getLeftURI() * @see #getMatchResource() @@ -1077,8 +1113,9 @@ public interface ComparePackage extends EPackage { EAttribute getMatchResource_LeftURI(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getRightURI <em>Right URI</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getRightURI + * <em>Right URI</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Right URI</em>'. * @see org.eclipse.emf.compare.MatchResource#getRightURI() * @see #getMatchResource() @@ -1087,8 +1124,9 @@ public interface ComparePackage extends EPackage { EAttribute getMatchResource_RightURI(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getOriginURI <em>Origin URI</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getOriginURI + * <em>Origin URI</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Origin URI</em>'. * @see org.eclipse.emf.compare.MatchResource#getOriginURI() * @see #getMatchResource() @@ -1097,8 +1135,9 @@ public interface ComparePackage extends EPackage { EAttribute getMatchResource_OriginURI(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getLeft <em>Left</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getLeft + * <em>Left</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Left</em>'. * @see org.eclipse.emf.compare.MatchResource#getLeft() * @see #getMatchResource() @@ -1107,8 +1146,9 @@ public interface ComparePackage extends EPackage { EAttribute getMatchResource_Left(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getRight <em>Right</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getRight + * <em>Right</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Right</em>'. * @see org.eclipse.emf.compare.MatchResource#getRight() * @see #getMatchResource() @@ -1117,8 +1157,9 @@ public interface ComparePackage extends EPackage { EAttribute getMatchResource_Right(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getOrigin <em>Origin</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.MatchResource#getOrigin + * <em>Origin</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Origin</em>'. * @see org.eclipse.emf.compare.MatchResource#getOrigin() * @see #getMatchResource() @@ -1127,9 +1168,10 @@ public interface ComparePackage extends EPackage { EAttribute getMatchResource_Origin(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.compare.MatchResource#getComparison <em>Comparison</em>}'. - * <!-- begin-user-doc + * Returns the meta object for the container reference ' + * {@link org.eclipse.emf.compare.MatchResource#getComparison <em>Comparison</em>}'. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @return the meta object for the container reference '<em>Comparison</em>'. * @see org.eclipse.emf.compare.MatchResource#getComparison() * @see #getMatchResource() @@ -1148,9 +1190,10 @@ public interface ComparePackage extends EPackage { EClass getMatch(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.compare.Match#getSubmatches <em>Submatches</em>}'. - * <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.compare.Match#getSubmatches <em>Submatches</em>}'. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @return the meta object for the containment reference list '<em>Submatches</em>'. * @see org.eclipse.emf.compare.Match#getSubmatches() * @see #getMatch() @@ -1159,9 +1202,10 @@ public interface ComparePackage extends EPackage { EReference getMatch_Submatches(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.compare.Match#getDifferences <em>Differences</em>}'. - * <!-- begin-user-doc --> + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.compare.Match#getDifferences <em>Differences</em>}'. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @return the meta object for the containment reference list '<em>Differences</em>'. * @see org.eclipse.emf.compare.Match#getDifferences() * @see #getMatch() @@ -1170,8 +1214,9 @@ public interface ComparePackage extends EPackage { EReference getMatch_Differences(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Match#getLeft <em>Left</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Match#getLeft <em>Left</em>} + * '. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Left</em>'. * @see org.eclipse.emf.compare.Match#getLeft() * @see #getMatch() @@ -1180,8 +1225,9 @@ public interface ComparePackage extends EPackage { EReference getMatch_Left(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Match#getRight <em>Right</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Match#getRight + * <em>Right</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Right</em>'. * @see org.eclipse.emf.compare.Match#getRight() * @see #getMatch() @@ -1190,8 +1236,9 @@ public interface ComparePackage extends EPackage { EReference getMatch_Right(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Match#getOrigin <em>Origin</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Match#getOrigin + * <em>Origin</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Origin</em>'. * @see org.eclipse.emf.compare.Match#getOrigin() * @see #getMatch() @@ -1210,8 +1257,9 @@ public interface ComparePackage extends EPackage { EClass getDiff(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.compare.Diff#getMatch <em>Match</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the container reference '{@link org.eclipse.emf.compare.Diff#getMatch + * <em>Match</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the container reference '<em>Match</em>'. * @see org.eclipse.emf.compare.Diff#getMatch() * @see #getDiff() @@ -1220,8 +1268,9 @@ public interface ComparePackage extends EPackage { EReference getDiff_Match(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getRequires <em>Requires</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getRequires + * <em>Requires</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference list '<em>Requires</em>'. * @see org.eclipse.emf.compare.Diff#getRequires() * @see #getDiff() @@ -1230,8 +1279,9 @@ public interface ComparePackage extends EPackage { EReference getDiff_Requires(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getRequiredBy <em>Required By</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getRequiredBy + * <em>Required By</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference list '<em>Required By</em>'. * @see org.eclipse.emf.compare.Diff#getRequiredBy() * @see #getDiff() @@ -1240,28 +1290,33 @@ public interface ComparePackage extends EPackage { EReference getDiff_RequiredBy(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getImplies <em>Implies</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getImplies + * <em>Implies</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference list '<em>Implies</em>'. * @see org.eclipse.emf.compare.Diff#getImplies() * @see #getDiff() * @generated + * @since 4.0 */ EReference getDiff_Implies(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getImpliedBy <em>Implied By</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getImpliedBy + * <em>Implied By</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference list '<em>Implied By</em>'. * @see org.eclipse.emf.compare.Diff#getImpliedBy() * @see #getDiff() * @generated + * @since 4.0 */ EReference getDiff_ImpliedBy(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getRefines <em>Refines</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getRefines + * <em>Refines</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference list '<em>Refines</em>'. * @see org.eclipse.emf.compare.Diff#getRefines() * @see #getDiff() @@ -1270,8 +1325,9 @@ public interface ComparePackage extends EPackage { EReference getDiff_Refines(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getRefinedBy <em>Refined By</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Diff#getRefinedBy + * <em>Refined By</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference list '<em>Refined By</em>'. * @see org.eclipse.emf.compare.Diff#getRefinedBy() * @see #getDiff() @@ -1280,19 +1336,21 @@ public interface ComparePackage extends EPackage { EReference getDiff_RefinedBy(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Diff#getPrimeRefining <em>Prime Refining</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Diff#getPrimeRefining + * <em>Prime Refining</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Prime Refining</em>'. * @see org.eclipse.emf.compare.Diff#getPrimeRefining() * @see #getDiff() * @generated + * @since 4.0 */ EReference getDiff_PrimeRefining(); /** * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Diff#getKind <em>Kind</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Kind</em>'. * @see org.eclipse.emf.compare.Diff#getKind() * @see #getDiff() @@ -1301,8 +1359,9 @@ public interface ComparePackage extends EPackage { EAttribute getDiff_Kind(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Diff#getSource <em>Source</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Diff#getSource + * <em>Source</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Source</em>'. * @see org.eclipse.emf.compare.Diff#getSource() * @see #getDiff() @@ -1311,8 +1370,9 @@ public interface ComparePackage extends EPackage { EAttribute getDiff_Source(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Diff#getState <em>State</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Diff#getState <em>State</em>} + * '. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>State</em>'. * @see org.eclipse.emf.compare.Diff#getState() * @see #getDiff() @@ -1321,8 +1381,9 @@ public interface ComparePackage extends EPackage { EAttribute getDiff_State(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Diff#getEquivalence <em>Equivalence</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Diff#getEquivalence + * <em>Equivalence</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Equivalence</em>'. * @see org.eclipse.emf.compare.Diff#getEquivalence() * @see #getDiff() @@ -1331,8 +1392,9 @@ public interface ComparePackage extends EPackage { EReference getDiff_Equivalence(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Diff#getConflict <em>Conflict</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.Diff#getConflict + * <em>Conflict</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Conflict</em>'. * @see org.eclipse.emf.compare.Diff#getConflict() * @see #getDiff() @@ -1341,8 +1403,9 @@ public interface ComparePackage extends EPackage { EReference getDiff_Conflict(); /** - * Returns the meta object for class '{@link org.eclipse.emf.compare.ResourceAttachmentChange <em>Resource Attachment Change</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.compare.ResourceAttachmentChange + * <em>Resource Attachment Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for class '<em>Resource Attachment Change</em>'. * @see org.eclipse.emf.compare.ResourceAttachmentChange * @generated @@ -1362,8 +1425,9 @@ public interface ComparePackage extends EPackage { EAttribute getResourceAttachmentChange_ResourceURI(); /** - * Returns the meta object for class '{@link org.eclipse.emf.compare.ReferenceChange <em>Reference Change</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.compare.ReferenceChange + * <em>Reference Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for class '<em>Reference Change</em>'. * @see org.eclipse.emf.compare.ReferenceChange * @generated @@ -1371,8 +1435,9 @@ public interface ComparePackage extends EPackage { EClass getReferenceChange(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.ReferenceChange#getReference <em>Reference</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.ReferenceChange#getReference + * <em>Reference</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Reference</em>'. * @see org.eclipse.emf.compare.ReferenceChange#getReference() * @see #getReferenceChange() @@ -1381,8 +1446,9 @@ public interface ComparePackage extends EPackage { EReference getReferenceChange_Reference(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.ReferenceChange#getValue <em>Value</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.ReferenceChange#getValue + * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Value</em>'. * @see org.eclipse.emf.compare.ReferenceChange#getValue() * @see #getReferenceChange() @@ -1391,8 +1457,9 @@ public interface ComparePackage extends EPackage { EReference getReferenceChange_Value(); /** - * Returns the meta object for class '{@link org.eclipse.emf.compare.AttributeChange <em>Attribute Change</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.compare.AttributeChange + * <em>Attribute Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for class '<em>Attribute Change</em>'. * @see org.eclipse.emf.compare.AttributeChange * @generated @@ -1400,8 +1467,9 @@ public interface ComparePackage extends EPackage { EClass getAttributeChange(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.AttributeChange#getAttribute <em>Attribute</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.AttributeChange#getAttribute + * <em>Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference '<em>Attribute</em>'. * @see org.eclipse.emf.compare.AttributeChange#getAttribute() * @see #getAttributeChange() @@ -1410,8 +1478,9 @@ public interface ComparePackage extends EPackage { EReference getAttributeChange_Attribute(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.AttributeChange#getValue <em>Value</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.AttributeChange#getValue + * <em>Value</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Value</em>'. * @see org.eclipse.emf.compare.AttributeChange#getValue() * @see #getAttributeChange() @@ -1430,8 +1499,9 @@ public interface ComparePackage extends EPackage { EClass getConflict(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Conflict#getKind <em>Kind</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.Conflict#getKind + * <em>Kind</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Kind</em>'. * @see org.eclipse.emf.compare.Conflict#getKind() * @see #getConflict() @@ -1440,8 +1510,9 @@ public interface ComparePackage extends EPackage { EAttribute getConflict_Kind(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Conflict#getDifferences <em>Differences</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Conflict#getDifferences + * <em>Differences</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the reference list '<em>Differences</em>'. * @see org.eclipse.emf.compare.Conflict#getDifferences() * @see #getConflict() @@ -1452,6 +1523,7 @@ public interface ComparePackage extends EPackage { /** * Returns the meta object for class '{@link org.eclipse.emf.compare.Equivalence <em>Equivalence</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for class '<em>Equivalence</em>'. * @see org.eclipse.emf.compare.Equivalence * @generated @@ -1459,9 +1531,10 @@ public interface ComparePackage extends EPackage { EClass getEquivalence(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.compare.Equivalence#getDifferences <em>Differences</em>}'. - * <!-- begin-user-doc + * Returns the meta object for the reference list ' + * {@link org.eclipse.emf.compare.Equivalence#getDifferences <em>Differences</em>}'. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @return the meta object for the reference list '<em>Differences</em>'. * @see org.eclipse.emf.compare.Equivalence#getDifferences() * @see #getEquivalence() @@ -1470,8 +1543,9 @@ public interface ComparePackage extends EPackage { EReference getEquivalence_Differences(); /** - * Returns the meta object for enum '{@link org.eclipse.emf.compare.DifferenceKind <em>Difference Kind</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for enum '{@link org.eclipse.emf.compare.DifferenceKind + * <em>Difference Kind</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for enum '<em>Difference Kind</em>'. * @see org.eclipse.emf.compare.DifferenceKind * @generated @@ -1479,8 +1553,9 @@ public interface ComparePackage extends EPackage { EEnum getDifferenceKind(); /** - * Returns the meta object for enum '{@link org.eclipse.emf.compare.DifferenceSource <em>Difference Source</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for enum '{@link org.eclipse.emf.compare.DifferenceSource + * <em>Difference Source</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for enum '<em>Difference Source</em>'. * @see org.eclipse.emf.compare.DifferenceSource * @generated @@ -1488,8 +1563,9 @@ public interface ComparePackage extends EPackage { EEnum getDifferenceSource(); /** - * Returns the meta object for enum '{@link org.eclipse.emf.compare.DifferenceState <em>Difference State</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for enum '{@link org.eclipse.emf.compare.DifferenceState + * <em>Difference State</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for enum '<em>Difference State</em>'. * @see org.eclipse.emf.compare.DifferenceState * @generated @@ -1499,6 +1575,7 @@ public interface ComparePackage extends EPackage { /** * Returns the meta object for enum '{@link org.eclipse.emf.compare.ConflictKind <em>Conflict Kind</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for enum '<em>Conflict Kind</em>'. * @see org.eclipse.emf.compare.ConflictKind * @generated @@ -1517,8 +1594,9 @@ public interface ComparePackage extends EPackage { EDataType getEIterable(); /** - * Returns the meta object for data type '{@link org.eclipse.emf.compare.utils.IEqualityHelper <em>IEquality Helper</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for data type '{@link org.eclipse.emf.compare.utils.IEqualityHelper + * <em>IEquality Helper</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for data type '<em>IEquality Helper</em>'. * @see org.eclipse.emf.compare.utils.IEqualityHelper * @model instanceClass="org.eclipse.emf.compare.utils.IEqualityHelper" serializeable="false" @@ -1527,12 +1605,14 @@ public interface ComparePackage extends EPackage { EDataType getIEqualityHelper(); /** - * Returns the meta object for data type '{@link org.eclipse.emf.common.util.Diagnostic <em>Diagnostic</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for data type '{@link org.eclipse.emf.common.util.Diagnostic + * <em>Diagnostic</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for data type '<em>Diagnostic</em>'. * @see org.eclipse.emf.common.util.Diagnostic * @model instanceClass="org.eclipse.emf.common.util.Diagnostic" serializeable="false" * @generated + * @since 4.0 */ EDataType getDiagnostic(); @@ -1554,14 +1634,16 @@ public interface ComparePackage extends EPackage { * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * * @generated */ @SuppressWarnings("hiding") // generated code, removing warnings interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.ComparisonImpl <em>Comparison</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.ComparisonImpl + * <em>Comparison</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.ComparisonImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getComparison() * @generated @@ -1569,8 +1651,9 @@ public interface ComparePackage extends EPackage { EClass COMPARISON = eINSTANCE.getComparison(); /** - * The meta object literal for the '<em><b>Matched Resources</b></em>' containment reference list feature. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Matched Resources</b></em>' containment reference list + * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ EReference COMPARISON__MATCHED_RESOURCES = eINSTANCE.getComparison_MatchedResources(); @@ -1586,6 +1669,7 @@ public interface ComparePackage extends EPackage { /** * The meta object literal for the '<em><b>Conflicts</b></em>' containment reference list feature. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ EReference COMPARISON__CONFLICTS = eINSTANCE.getComparison_Conflicts(); @@ -1593,29 +1677,32 @@ public interface ComparePackage extends EPackage { /** * The meta object literal for the '<em><b>Equivalences</b></em>' containment reference list feature. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ EReference COMPARISON__EQUIVALENCES = eINSTANCE.getComparison_Equivalences(); /** - * The meta object literal for the '<em><b>Three Way</b></em>' attribute feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Three Way</b></em>' attribute feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ EAttribute COMPARISON__THREE_WAY = eINSTANCE.getComparison_ThreeWay(); /** - * The meta object literal for the '<em><b>Diagnostic</b></em>' attribute feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Diagnostic</b></em>' attribute feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated + * @since 4.0 */ EAttribute COMPARISON__DIAGNOSTIC = eINSTANCE.getComparison_Diagnostic(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.MatchResourceImpl <em>Match Resource</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.MatchResourceImpl + * <em>Match Resource</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.MatchResourceImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getMatchResource() * @generated @@ -1623,49 +1710,49 @@ public interface ComparePackage extends EPackage { EClass MATCH_RESOURCE = eINSTANCE.getMatchResource(); /** - * The meta object literal for the '<em><b>Left URI</b></em>' attribute feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Left URI</b></em>' attribute feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ EAttribute MATCH_RESOURCE__LEFT_URI = eINSTANCE.getMatchResource_LeftURI(); /** - * The meta object literal for the '<em><b>Right URI</b></em>' attribute feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Right URI</b></em>' attribute feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ EAttribute MATCH_RESOURCE__RIGHT_URI = eINSTANCE.getMatchResource_RightURI(); /** - * The meta object literal for the '<em><b>Origin URI</b></em>' attribute feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Origin URI</b></em>' attribute feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ EAttribute MATCH_RESOURCE__ORIGIN_URI = eINSTANCE.getMatchResource_OriginURI(); /** - * The meta object literal for the '<em><b>Left</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Left</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EAttribute MATCH_RESOURCE__LEFT = eINSTANCE.getMatchResource_Left(); /** - * The meta object literal for the '<em><b>Right</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Right</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EAttribute MATCH_RESOURCE__RIGHT = eINSTANCE.getMatchResource_Right(); /** - * The meta object literal for the '<em><b>Origin</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Origin</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EAttribute MATCH_RESOURCE__ORIGIN = eINSTANCE.getMatchResource_Origin(); @@ -1679,8 +1766,9 @@ public interface ComparePackage extends EPackage { EReference MATCH_RESOURCE__COMPARISON = eINSTANCE.getMatchResource_Comparison(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.MatchImpl <em>Match</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.MatchImpl <em>Match</em>}' + * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.MatchImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getMatch() * @generated @@ -1690,6 +1778,7 @@ public interface ComparePackage extends EPackage { /** * The meta object literal for the '<em><b>Submatches</b></em>' containment reference list feature. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ EReference MATCH__SUBMATCHES = eINSTANCE.getMatch_Submatches(); @@ -1697,37 +1786,39 @@ public interface ComparePackage extends EPackage { /** * The meta object literal for the '<em><b>Differences</b></em>' containment reference list feature. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ EReference MATCH__DIFFERENCES = eINSTANCE.getMatch_Differences(); /** - * The meta object literal for the '<em><b>Left</b></em>' reference feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Left</b></em>' reference feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EReference MATCH__LEFT = eINSTANCE.getMatch_Left(); /** - * The meta object literal for the '<em><b>Right</b></em>' reference feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Right</b></em>' reference feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EReference MATCH__RIGHT = eINSTANCE.getMatch_Right(); /** - * The meta object literal for the '<em><b>Origin</b></em>' reference feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Origin</b></em>' reference feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EReference MATCH__ORIGIN = eINSTANCE.getMatch_Origin(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.DiffImpl <em>Diff</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.DiffImpl <em>Diff</em>}' + * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.DiffImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDiff() * @generated @@ -1763,6 +1854,7 @@ public interface ComparePackage extends EPackage { * begin-user-doc --> <!-- end-user-doc --> * * @generated + * @since 4.0 */ EReference DIFF__IMPLIES = eINSTANCE.getDiff_Implies(); @@ -1771,6 +1863,7 @@ public interface ComparePackage extends EPackage { * begin-user-doc --> <!-- end-user-doc --> * * @generated + * @since 4.0 */ EReference DIFF__IMPLIED_BY = eINSTANCE.getDiff_ImpliedBy(); @@ -1791,33 +1884,34 @@ public interface ComparePackage extends EPackage { EReference DIFF__REFINED_BY = eINSTANCE.getDiff_RefinedBy(); /** - * The meta object literal for the '<em><b>Prime Refining</b></em>' reference feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The meta object literal for the '<em><b>Prime Refining</b></em>' reference feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @generated + * @since 4.0 */ EReference DIFF__PRIME_REFINING = eINSTANCE.getDiff_PrimeRefining(); /** - * The meta object literal for the '<em><b>Kind</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Kind</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EAttribute DIFF__KIND = eINSTANCE.getDiff_Kind(); /** - * The meta object literal for the '<em><b>Source</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Source</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EAttribute DIFF__SOURCE = eINSTANCE.getDiff_Source(); /** - * The meta object literal for the '<em><b>State</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>State</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EAttribute DIFF__STATE = eINSTANCE.getDiff_State(); @@ -1831,16 +1925,17 @@ public interface ComparePackage extends EPackage { EReference DIFF__EQUIVALENCE = eINSTANCE.getDiff_Equivalence(); /** - * The meta object literal for the '<em><b>Conflict</b></em>' reference feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Conflict</b></em>' reference feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ EReference DIFF__CONFLICT = eINSTANCE.getDiff_Conflict(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.ResourceAttachmentChangeImpl <em>Resource Attachment Change</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.ResourceAttachmentChangeImpl + * <em>Resource Attachment Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.ResourceAttachmentChangeImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getResourceAttachmentChange() * @generated @@ -1857,8 +1952,9 @@ public interface ComparePackage extends EPackage { .getResourceAttachmentChange_ResourceURI(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.ReferenceChangeImpl <em>Reference Change</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.ReferenceChangeImpl + * <em>Reference Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.ReferenceChangeImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getReferenceChange() * @generated @@ -1866,24 +1962,25 @@ public interface ComparePackage extends EPackage { EClass REFERENCE_CHANGE = eINSTANCE.getReferenceChange(); /** - * The meta object literal for the '<em><b>Reference</b></em>' reference feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Reference</b></em>' reference feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ EReference REFERENCE_CHANGE__REFERENCE = eINSTANCE.getReferenceChange_Reference(); /** - * The meta object literal for the '<em><b>Value</b></em>' reference feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EReference REFERENCE_CHANGE__VALUE = eINSTANCE.getReferenceChange_Value(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.AttributeChangeImpl <em>Attribute Change</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.AttributeChangeImpl + * <em>Attribute Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.AttributeChangeImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getAttributeChange() * @generated @@ -1891,24 +1988,25 @@ public interface ComparePackage extends EPackage { EClass ATTRIBUTE_CHANGE = eINSTANCE.getAttributeChange(); /** - * The meta object literal for the '<em><b>Attribute</b></em>' reference feature. - * <!-- begin-user-doc + * The meta object literal for the '<em><b>Attribute</b></em>' reference feature. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @generated */ EReference ATTRIBUTE_CHANGE__ATTRIBUTE = eINSTANCE.getAttributeChange_Attribute(); /** - * The meta object literal for the '<em><b>Value</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Value</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EAttribute ATTRIBUTE_CHANGE__VALUE = eINSTANCE.getAttributeChange_Value(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.ConflictImpl <em>Conflict</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.ConflictImpl + * <em>Conflict</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.ConflictImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getConflict() * @generated @@ -1916,9 +2014,9 @@ public interface ComparePackage extends EPackage { EClass CONFLICT = eINSTANCE.getConflict(); /** - * The meta object literal for the '<em><b>Kind</b></em>' attribute feature. - * <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Kind</b></em>' attribute feature. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @generated */ EAttribute CONFLICT__KIND = eINSTANCE.getConflict_Kind(); @@ -1932,8 +2030,9 @@ public interface ComparePackage extends EPackage { EReference CONFLICT__DIFFERENCES = eINSTANCE.getConflict_Differences(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.impl.EquivalenceImpl <em>Equivalence</em>}' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.impl.EquivalenceImpl + * <em>Equivalence</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.impl.EquivalenceImpl * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getEquivalence() * @generated @@ -1949,8 +2048,9 @@ public interface ComparePackage extends EPackage { EReference EQUIVALENCE__DIFFERENCES = eINSTANCE.getEquivalence_Differences(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.DifferenceKind <em>Difference Kind</em>}' enum. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.DifferenceKind + * <em>Difference Kind</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.DifferenceKind * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDifferenceKind() * @generated @@ -1958,8 +2058,9 @@ public interface ComparePackage extends EPackage { EEnum DIFFERENCE_KIND = eINSTANCE.getDifferenceKind(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.DifferenceSource <em>Difference Source</em>}' enum. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.DifferenceSource + * <em>Difference Source</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.DifferenceSource * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDifferenceSource() * @generated @@ -1967,8 +2068,9 @@ public interface ComparePackage extends EPackage { EEnum DIFFERENCE_SOURCE = eINSTANCE.getDifferenceSource(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.DifferenceState <em>Difference State</em>}' enum. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.DifferenceState + * <em>Difference State</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.DifferenceState * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDifferenceState() * @generated @@ -1976,8 +2078,9 @@ public interface ComparePackage extends EPackage { EEnum DIFFERENCE_STATE = eINSTANCE.getDifferenceState(); /** - * The meta object literal for the '{@link org.eclipse.emf.compare.ConflictKind <em>Conflict Kind</em>}' enum. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.compare.ConflictKind + * <em>Conflict Kind</em>}' enum. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.compare.ConflictKind * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getConflictKind() * @generated @@ -1985,9 +2088,9 @@ public interface ComparePackage extends EPackage { EEnum CONFLICT_KIND = eINSTANCE.getConflictKind(); /** - * The meta object literal for the '<em>EIterable</em>' data type. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em>EIterable</em>' data type. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @see java.lang.Iterable * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getEIterable() * @generated @@ -1995,9 +2098,9 @@ public interface ComparePackage extends EPackage { EDataType EITERABLE = eINSTANCE.getEIterable(); /** - * The meta object literal for the '<em>IEquality Helper</em>' data type. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em>IEquality Helper</em>' data type. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @see org.eclipse.emf.compare.utils.IEqualityHelper * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getIEqualityHelper() * @generated @@ -2005,12 +2108,13 @@ public interface ComparePackage extends EPackage { EDataType IEQUALITY_HELPER = eINSTANCE.getIEqualityHelper(); /** - * The meta object literal for the '<em>Diagnostic</em>' data type. - * <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em>Diagnostic</em>' data type. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @see org.eclipse.emf.common.util.Diagnostic * @see org.eclipse.emf.compare.impl.ComparePackageImpl#getDiagnostic() * @generated + * @since 4.0 */ EDataType DIAGNOSTIC = eINSTANCE.getDiagnostic(); diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Comparison.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Comparison.java index 314a42dcb..770afc561 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Comparison.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Comparison.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.EObject; public interface Comparison extends EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$ @@ -82,12 +83,11 @@ public interface Comparison extends EObject { EList<Conflict> getConflicts(); /** - * Returns the value of the '<em><b>Equivalences</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.emf.compare.Equivalence}. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * <!-- begin-model-doc --> - * If we detected any equivalence between diffs during the comparison process, this will contain them. - * <!-- end-model-doc --> + * Returns the value of the '<em><b>Equivalences</b></em>' containment reference list. The list contents + * are of type {@link org.eclipse.emf.compare.Equivalence}. <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-model-doc --> If we detected any equivalence between diffs during the comparison process, + * this will contain them. <!-- end-model-doc --> + * * @return the value of the '<em>Equivalences</em>' containment reference list. * @see org.eclipse.emf.compare.ComparePackage#getComparison_Equivalences() * @model containment="true" @@ -139,15 +139,16 @@ public interface Comparison extends EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @model kind="operation" dataType="org.eclipse.emf.compare.IEqualityHelper" * @generated */ IEqualityHelper getEqualityHelper(); /** - * Returns the value of the '<em><b>Three Way</b></em>' attribute. - * <!-- begin-user-doc --> <!-- + * Returns the value of the '<em><b>Three Way</b></em>' attribute. <!-- begin-user-doc --> <!-- * end-user-doc --> + * * @return the value of the '<em>Three Way</em>' attribute. * @see #setThreeWay(boolean) * @see org.eclipse.emf.compare.ComparePackage#getComparison_ThreeWay() @@ -157,35 +158,41 @@ public interface Comparison extends EObject { boolean isThreeWay(); /** - * Sets the value of the '{@link org.eclipse.emf.compare.Comparison#isThreeWay <em>Three Way</em>}' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param value the new value of the '<em>Three Way</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.compare.Comparison#isThreeWay <em>Three Way</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Three Way</em>' attribute. * @see #isThreeWay() * @generated */ void setThreeWay(boolean value); /** - * Returns the value of the '<em><b>Diagnostic</b></em>' attribute. - * <!-- begin-user-doc --> + * Returns the value of the '<em><b>Diagnostic</b></em>' attribute. <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Diagnostic</em>' attribute isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> + * * @return the value of the '<em>Diagnostic</em>' attribute. * @see #setDiagnostic(Diagnostic) * @see org.eclipse.emf.compare.ComparePackage#getComparison_Diagnostic() * @model dataType="org.eclipse.emf.compare.Diagnostic" transient="true" + * @since 4.0 * @generated */ Diagnostic getDiagnostic(); /** - * Sets the value of the '{@link org.eclipse.emf.compare.Comparison#getDiagnostic <em>Diagnostic</em>}' attribute. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param value the new value of the '<em>Diagnostic</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.compare.Comparison#getDiagnostic <em>Diagnostic</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param value + * the new value of the '<em>Diagnostic</em>' attribute. * @see #getDiagnostic() + * @since 4.0 * @generated */ void setDiagnostic(Diagnostic value); diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Diff.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Diff.java index 2447dde56..78fa709e2 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Diff.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Diff.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,57 +11,50 @@ package org.eclipse.emf.compare;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diff</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A DiffElement describes a difference related to the EObjects mapped by its parent MatchElement.
- * <!-- end-model-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Diff</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-model-doc --> A DiffElement describes a difference related to the EObjects mapped by its parent
+ * MatchElement. <!-- end-model-doc -->
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.compare.Diff#getMatch <em>Match</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getRequires <em>Requires</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getRequiredBy <em>Required By</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getImplies <em>Implies</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getImpliedBy <em>Implied By</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getRefines <em>Refines</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getRefinedBy <em>Refined By</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getPrimeRefining <em>Prime Refining</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getState <em>State</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getEquivalence <em>Equivalence</em>}</li>
- * <li>{@link org.eclipse.emf.compare.Diff#getConflict <em>Conflict</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getMatch <em>Match</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getRequires <em>Requires</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getRequiredBy <em>Required By</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getImplies <em>Implies</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getImpliedBy <em>Implied By</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getRefines <em>Refines</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getRefinedBy <em>Refined By</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getPrimeRefining <em>Prime Refining</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getState <em>State</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getEquivalence <em>Equivalence</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.Diff#getConflict <em>Conflict</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.compare.ComparePackage#getDiff()
* @model
* @generated
*/
public interface Diff extends EObject {
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$
/**
- * Returns the value of the '<em><b>Match</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Match#getDifferences <em>Differences</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Back-reference towards this difference's parent match, it points towards the mapping on which this difference has been detected.
+ * Returns the value of the '<em><b>Match</b></em>' container reference. It is bidirectional and its
+ * opposite is '{@link org.eclipse.emf.compare.Match#getDifferences <em>Differences</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> Back-reference towards this
+ * difference's parent match, it points towards the mapping on which this difference has been detected.
* <!-- end-model-doc -->
+ *
* @return the value of the '<em>Match</em>' container reference.
* @see #setMatch(Match)
* @see org.eclipse.emf.compare.ComparePackage#getDiff_Match()
@@ -72,24 +65,23 @@ public interface Diff extends EObject { Match getMatch();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getMatch <em>Match</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Match</em>' container reference.
+ * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getMatch <em>Match</em>}' container
+ * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Match</em>' container reference.
* @see #getMatch()
* @generated
*/
void setMatch(Match value);
/**
- * Returns the value of the '<em><b>Requires</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.compare.Diff}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Diff#getRequiredBy <em>Required By</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This will reference all differences that should be merged before this one.
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>Requires</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.compare.Diff}. It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.compare.Diff#getRequiredBy <em>Required By</em>}'. <!-- begin-user-doc --> <!--
+ * end-user-doc --> <!-- begin-model-doc --> This will reference all differences that should be merged
+ * before this one. <!-- end-model-doc -->
+ *
* @return the value of the '<em>Requires</em>' reference list.
* @see org.eclipse.emf.compare.ComparePackage#getDiff_Requires()
* @see org.eclipse.emf.compare.Diff#getRequiredBy
@@ -99,14 +91,12 @@ public interface Diff extends EObject { EList<Diff> getRequires();
/**
- * Returns the value of the '<em><b>Required By</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.compare.Diff}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Diff#getRequires <em>Requires</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This will reference all differences that depend on this one for their merging.
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>Required By</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.compare.Diff}. It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.compare.Diff#getRequires <em>Requires</em>}'. <!-- begin-user-doc --> <!--
+ * end-user-doc --> <!-- begin-model-doc --> This will reference all differences that depend on this one
+ * for their merging. <!-- end-model-doc -->
+ *
* @return the value of the '<em>Required By</em>' reference list.
* @see org.eclipse.emf.compare.ComparePackage#getDiff_RequiredBy()
* @see org.eclipse.emf.compare.Diff#getRequires
@@ -116,50 +106,53 @@ public interface Diff extends EObject { EList<Diff> getRequiredBy();
/**
- * Returns the value of the '<em><b>Implies</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.compare.Diff}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Diff#getImpliedBy <em>Implied By</em>}'.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Implies</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.compare.Diff}. It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.compare.Diff#getImpliedBy <em>Implied By</em>}'. <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Implies</em>' reference list isn't clear,
- * there really should be more of a description here...
+ * If the meaning of the '<em>Implies</em>' reference list isn't clear, there really should be more of a
+ * description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Implies</em>' reference list.
* @see org.eclipse.emf.compare.ComparePackage#getDiff_Implies()
* @see org.eclipse.emf.compare.Diff#getImpliedBy
* @model opposite="impliedBy"
+ * @since 4.0
* @generated
*/
EList<Diff> getImplies();
/**
- * Returns the value of the '<em><b>Implied By</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.compare.Diff}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Diff#getImplies <em>Implies</em>}'.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Implied By</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.compare.Diff}. It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.compare.Diff#getImplies <em>Implies</em>}'. <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Implied By</em>' reference list isn't clear,
- * there really should be more of a description here...
+ * If the meaning of the '<em>Implied By</em>' reference list isn't clear, there really should be more of
+ * a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Implied By</em>' reference list.
* @see org.eclipse.emf.compare.ComparePackage#getDiff_ImpliedBy()
* @see org.eclipse.emf.compare.Diff#getImplies
* @model opposite="implies"
+ * @since 4.0
* @generated
*/
EList<Diff> getImpliedBy();
/**
- * Returns the value of the '<em><b>Refines</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.compare.Diff}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Diff#getRefinedBy <em>Refined By</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This can be used to create "high level" differences to regroup one or more diffs in a common "container". For example, this could be used to regroup <i>n</i> technical differences into one single semantic difference, such as the differences "profile application added" and "reference to stereotype added" that can actually be regrouped under a single, more understandable "stereotype application added".
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>Refines</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.compare.Diff}. It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.compare.Diff#getRefinedBy <em>Refined By</em>}'. <!-- begin-user-doc --> <!--
+ * end-user-doc --> <!-- begin-model-doc --> This can be used to create "high level" differences to
+ * regroup one or more diffs in a common "container". For example, this could be used to regroup <i>n</i>
+ * technical differences into one single semantic difference, such as the differences
+ * "profile application added" and "reference to stereotype added" that can actually be regrouped under a
+ * single, more understandable "stereotype application added". <!-- end-model-doc -->
+ *
* @return the value of the '<em>Refines</em>' reference list.
* @see org.eclipse.emf.compare.ComparePackage#getDiff_Refines()
* @see org.eclipse.emf.compare.Diff#getRefinedBy
@@ -169,14 +162,12 @@ public interface Diff extends EObject { EList<Diff> getRefines();
/**
- * Returns the value of the '<em><b>Refined By</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.compare.Diff}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Diff#getRefines <em>Refines</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This will reference the higher-level difference that shadows this one, if any.
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>Refined By</b></em>' reference list. The list contents are of type
+ * {@link org.eclipse.emf.compare.Diff}. It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.compare.Diff#getRefines <em>Refines</em>}'. <!-- begin-user-doc --> <!--
+ * end-user-doc --> <!-- begin-model-doc --> This will reference the higher-level difference that shadows
+ * this one, if any. <!-- end-model-doc -->
+ *
* @return the value of the '<em>Refined By</em>' reference list.
* @see org.eclipse.emf.compare.ComparePackage#getDiff_RefinedBy()
* @see org.eclipse.emf.compare.Diff#getRefines
@@ -186,28 +177,27 @@ public interface Diff extends EObject { EList<Diff> getRefinedBy();
/**
- * Returns the value of the '<em><b>Prime Refining</b></em>' reference.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Prime Refining</em>' reference isn't clear,
- * there really should be more of a description here...
+ * If the meaning of the '<em>Prime Refining</em>' reference isn't clear, there really should be more of a
+ * description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Prime Refining</em>' reference.
* @see org.eclipse.emf.compare.ComparePackage#getDiff_PrimeRefining()
* @model transient="true" changeable="false" derived="true"
+ * @since 4.0
* @generated
*/
Diff getPrimeRefining();
/**
- * Returns the value of the '<em><b>Kind</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.emf.compare.DifferenceKind}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Describes the kind of this difference, whether it is an addition, deletion, change, or move.
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>Kind</b></em>' attribute. The literals are from the enumeration
+ * {@link org.eclipse.emf.compare.DifferenceKind}. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+ * begin-model-doc --> Describes the kind of this difference, whether it is an addition, deletion, change,
+ * or move. <!-- end-model-doc -->
+ *
* @return the value of the '<em>Kind</em>' attribute.
* @see org.eclipse.emf.compare.DifferenceKind
* @see #setKind(DifferenceKind)
@@ -218,10 +208,11 @@ public interface Diff extends EObject { DifferenceKind getKind();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getKind <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Kind</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getKind <em>Kind</em>}' attribute. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Kind</em>' attribute.
* @see org.eclipse.emf.compare.DifferenceKind
* @see #getKind()
* @generated
@@ -229,13 +220,11 @@ public interface Diff extends EObject { void setKind(DifferenceKind value);
/**
- * Returns the value of the '<em><b>Conflict</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Conflict#getDifferences <em>Differences</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * If this element is in conflict with one (or more) other differences, this will reference the Conflict association.
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>Conflict</b></em>' reference. It is bidirectional and its opposite is
+ * '{@link org.eclipse.emf.compare.Conflict#getDifferences <em>Differences</em>}'. <!-- begin-user-doc -->
+ * <!-- end-user-doc --> <!-- begin-model-doc --> If this element is in conflict with one (or more) other
+ * differences, this will reference the Conflict association. <!-- end-model-doc -->
+ *
* @return the value of the '<em>Conflict</em>' reference.
* @see #setConflict(Conflict)
* @see org.eclipse.emf.compare.ComparePackage#getDiff_Conflict()
@@ -247,22 +236,22 @@ public interface Diff extends EObject { /**
* Sets the value of the '{@link org.eclipse.emf.compare.Diff#getConflict <em>Conflict</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Conflict</em>' reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Conflict</em>' reference.
* @see #getConflict()
* @generated
*/
void setConflict(Conflict value);
/**
- * Returns the value of the '<em><b>Source</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.emf.compare.DifferenceSource}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Returns the source of this diff, either one of DifferenceSource.LEFT (for two-way comparisons or differences detected between the left and origin elements) or DifferenceSource.RIGHT (for differences between the right and origin elements).
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>Source</b></em>' attribute. The literals are from the enumeration
+ * {@link org.eclipse.emf.compare.DifferenceSource}. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+ * begin-model-doc --> Returns the source of this diff, either one of DifferenceSource.LEFT (for two-way
+ * comparisons or differences detected between the left and origin elements) or DifferenceSource.RIGHT
+ * (for differences between the right and origin elements). <!-- end-model-doc -->
+ *
* @return the value of the '<em>Source</em>' attribute.
* @see org.eclipse.emf.compare.DifferenceSource
* @see #setSource(DifferenceSource)
@@ -273,10 +262,11 @@ public interface Diff extends EObject { DifferenceSource getSource();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getSource <em>Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getSource <em>Source</em>}' attribute. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Source</em>' attribute.
* @see org.eclipse.emf.compare.DifferenceSource
* @see #getSource()
* @generated
@@ -284,13 +274,12 @@ public interface Diff extends EObject { void setSource(DifferenceSource value);
/**
- * Returns the value of the '<em><b>State</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.emf.compare.DifferenceState}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Returns the current state of this diff, either one of DifferenceState.UNRESOLVED (Diff is still in its initial state), DifferenceState.MERGED when the Diff has been merged or DifferenceState.DISCARDED if the user chose to ignore this difference.
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>State</b></em>' attribute. The literals are from the enumeration
+ * {@link org.eclipse.emf.compare.DifferenceState}. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
+ * begin-model-doc --> Returns the current state of this diff, either one of DifferenceState.UNRESOLVED
+ * (Diff is still in its initial state), DifferenceState.MERGED when the Diff has been merged or
+ * DifferenceState.DISCARDED if the user chose to ignore this difference. <!-- end-model-doc -->
+ *
* @return the value of the '<em>State</em>' attribute.
* @see org.eclipse.emf.compare.DifferenceState
* @see #setState(DifferenceState)
@@ -301,10 +290,11 @@ public interface Diff extends EObject { DifferenceState getState();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getState <em>State</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>State</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getState <em>State</em>}' attribute. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>State</em>' attribute.
* @see org.eclipse.emf.compare.DifferenceState
* @see #getState()
* @generated
@@ -312,13 +302,13 @@ public interface Diff extends EObject { void setState(DifferenceState value);
/**
- * Returns the value of the '<em><b>Equivalence</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Equivalence#getDifferences <em>Differences</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * If this diff is equivalent to another, we will reference the equivalence from here. For example, if a reference has an eOpposite, we will detect one diff for each side of the bidirectional reference, yet merging one of these diffs is enough. We consider them equivalent.
- * <!-- end-model-doc -->
+ * Returns the value of the '<em><b>Equivalence</b></em>' reference. It is bidirectional and its opposite
+ * is '{@link org.eclipse.emf.compare.Equivalence#getDifferences <em>Differences</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> If this diff is equivalent to
+ * another, we will reference the equivalence from here. For example, if a reference has an eOpposite, we
+ * will detect one diff for each side of the bidirectional reference, yet merging one of these diffs is
+ * enough. We consider them equivalent. <!-- end-model-doc -->
+ *
* @return the value of the '<em>Equivalence</em>' reference.
* @see #setEquivalence(Equivalence)
* @see org.eclipse.emf.compare.ComparePackage#getDiff_Equivalence()
@@ -329,21 +319,20 @@ public interface Diff extends EObject { Equivalence getEquivalence();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getEquivalence <em>Equivalence</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Equivalence</em>' reference.
+ * Sets the value of the '{@link org.eclipse.emf.compare.Diff#getEquivalence <em>Equivalence</em>}'
+ * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Equivalence</em>' reference.
* @see #getEquivalence()
* @generated
*/
void setEquivalence(Equivalence value);
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This will merge the diff from left to right.
- * <!-- end-model-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> This will merge the diff from
+ * left to right. <!-- end-model-doc -->
+ *
* @model
* @generated
*/
@@ -351,11 +340,9 @@ public interface Diff extends EObject { void copyRightToLeft();
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This will merge the diff from right to left.
- * <!-- end-model-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> This will merge the diff from
+ * right to left. <!-- end-model-doc -->
+ *
* @model
* @generated
*/
@@ -363,11 +350,9 @@ public interface Diff extends EObject { void copyLeftToRight();
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This will remove the diff from the model, effectively "forgetting" about it.
- * <!-- end-model-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> This will remove the diff from
+ * the model, effectively "forgetting" about it. <!-- end-model-doc -->
+ *
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java index 0b2253082..c37231caf 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,7 +10,6 @@ */ package org.eclipse.emf.compare.impl; -import java.lang.Iterable; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.emf.compare.AttributeChange; import org.eclipse.emf.compare.CompareFactory; @@ -41,120 +40,137 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> + * * @generated */ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public static final String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$ /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass comparisonEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass matchResourceEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass matchEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass diffEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass resourceAttachmentChangeEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass referenceChangeEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass attributeChangeEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass conflictEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass equivalenceEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EEnum differenceKindEEnum = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EEnum differenceSourceEEnum = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EEnum differenceStateEEnum = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EEnum conflictKindEEnum = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType eIterableEDataType = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType iEqualityHelperEDataType = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType diagnosticEDataType = null; /** * Creates an instance of the model <b>Package</b>, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package - * package URI value. - * <p>Note: the correct way to create the package is via the static - * factory method {@link #init init()}, which also performs - * initialization of the package, or returns the registered package, - * if one already exists. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package package URI value. + * <p> + * Note: the correct way to create the package is via the static factory method {@link #init init()}, + * which also performs initialization of the package, or returns the registered package, if one already + * exists. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.emf.compare.ComparePackage#eNS_URI * @see #init() @@ -166,24 +182,28 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private static boolean isInited = false; /** - * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * - * <p>This method is used to initialize {@link ComparePackage#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. + * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it + * depends. + * <p> + * This method is used to initialize {@link ComparePackage#eINSTANCE} when that field is accessed. Clients + * should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() * @generated */ public static ComparePackage init() { - if (isInited) + if (isInited) { return (ComparePackage)EPackage.Registry.INSTANCE.getEPackage(ComparePackage.eNS_URI); + } // Obtain or create and register package ComparePackageImpl theComparePackage = (ComparePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ComparePackageImpl ? EPackage.Registry.INSTANCE @@ -211,6 +231,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getComparison() { @@ -219,6 +240,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getComparison_MatchedResources() { @@ -227,6 +249,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getComparison_Matches() { @@ -235,6 +258,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getComparison_Conflicts() { @@ -243,6 +267,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getComparison_Equivalences() { @@ -251,6 +276,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getComparison_ThreeWay() { @@ -259,6 +285,8 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @since 4.0 * @generated */ public EAttribute getComparison_Diagnostic() { @@ -267,6 +295,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getMatchResource() { @@ -275,6 +304,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getMatchResource_LeftURI() { @@ -283,6 +313,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getMatchResource_RightURI() { @@ -291,6 +322,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getMatchResource_OriginURI() { @@ -299,6 +331,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getMatchResource_Left() { @@ -307,6 +340,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getMatchResource_Right() { @@ -315,6 +349,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getMatchResource_Origin() { @@ -323,6 +358,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getMatchResource_Comparison() { @@ -331,6 +367,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getMatch() { @@ -339,6 +376,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getMatch_Submatches() { @@ -347,6 +385,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getMatch_Differences() { @@ -355,6 +394,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getMatch_Left() { @@ -363,6 +403,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getMatch_Right() { @@ -371,6 +412,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getMatch_Origin() { @@ -379,6 +421,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getDiff() { @@ -387,6 +430,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getDiff_Match() { @@ -395,6 +439,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getDiff_Requires() { @@ -403,6 +448,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getDiff_RequiredBy() { @@ -411,6 +457,8 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @since 4.0 * @generated */ public EReference getDiff_Implies() { @@ -419,6 +467,8 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @since 4.0 * @generated */ public EReference getDiff_ImpliedBy() { @@ -427,6 +477,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getDiff_Refines() { @@ -435,6 +486,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getDiff_RefinedBy() { @@ -442,8 +494,9 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @since 4.0 * @generated */ public EReference getDiff_PrimeRefining() { @@ -452,6 +505,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getDiff_Kind() { @@ -460,6 +514,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getDiff_Source() { @@ -468,6 +523,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getDiff_State() { @@ -476,6 +532,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getDiff_Equivalence() { @@ -484,6 +541,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getDiff_Conflict() { @@ -492,6 +550,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getResourceAttachmentChange() { @@ -500,6 +559,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getResourceAttachmentChange_ResourceURI() { @@ -508,6 +568,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getReferenceChange() { @@ -516,6 +577,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getReferenceChange_Reference() { @@ -524,6 +586,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getReferenceChange_Value() { @@ -532,6 +595,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getAttributeChange() { @@ -540,6 +604,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getAttributeChange_Attribute() { @@ -548,6 +613,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getAttributeChange_Value() { @@ -556,6 +622,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getConflict() { @@ -564,6 +631,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getConflict_Kind() { @@ -572,6 +640,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getConflict_Differences() { @@ -580,6 +649,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getEquivalence() { @@ -588,6 +658,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getEquivalence_Differences() { @@ -596,6 +667,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EEnum getDifferenceKind() { @@ -604,6 +676,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EEnum getDifferenceSource() { @@ -612,6 +685,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EEnum getDifferenceState() { @@ -620,6 +694,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EEnum getConflictKind() { @@ -628,6 +703,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EDataType getEIterable() { @@ -636,6 +712,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EDataType getIEqualityHelper() { @@ -644,6 +721,8 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @since 4.0 * @generated */ public EDataType getDiagnostic() { @@ -652,6 +731,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public CompareFactory getCompareFactory() { @@ -660,19 +740,21 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates the meta-model objects for the package. This method is guarded to have no affect on any + * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void createPackageContents() { - if (isCreated) + if (isCreated) { return; + } isCreated = true; // Create classes and their features @@ -747,19 +829,21 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Complete the initialization of the package and its meta-model. This method is guarded to have no affect + * on any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void initializePackageContents() { - if (isInitialized) + if (isInitialized) { return; + } isInitialized = true; // Initialize package diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparisonImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparisonImpl.java index 6f0bef8fb..654338043 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparisonImpl.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparisonImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,28 +39,30 @@ import org.eclipse.emf.ecore.util.InternalEList; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getMatchedResources <em>Matched Resources</em>}</li> - * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getMatches <em>Matches</em>}</li> - * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getConflicts <em>Conflicts</em>}</li> - * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getEquivalences <em>Equivalences</em>}</li> - * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#isThreeWay <em>Three Way</em>}</li> - * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getDiagnostic <em>Diagnostic</em>}</li> + * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getMatchedResources <em>Matched Resources</em>}</li> + * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getMatches <em>Matches</em>}</li> + * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getConflicts <em>Conflicts</em>}</li> + * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getEquivalences <em>Equivalences</em>}</li> + * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#isThreeWay <em>Three Way</em>}</li> + * <li>{@link org.eclipse.emf.compare.impl.ComparisonImpl#getDiagnostic <em>Diagnostic</em>}</li> * </ul> * </p> - * + * * @generated */ @SuppressWarnings("boxing") public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public static final String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$ /** - * The cached value of the '{@link #getMatchedResources() <em>Matched Resources</em>}' containment reference list. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached value of the '{@link #getMatchedResources() <em>Matched Resources</em>}' containment + * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see #getMatchedResources() * @generated * @ordered @@ -90,6 +92,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * The cached value of the '{@link #getEquivalences() <em>Equivalences</em>}' containment reference list. * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see #getEquivalences() * @generated * @ordered @@ -97,9 +100,9 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { protected EList<Equivalence> equivalences; /** - * The default value of the '{@link #isThreeWay() <em>Three Way</em>}' attribute. - * <!-- begin-user-doc --> + * The default value of the '{@link #isThreeWay() <em>Three Way</em>}' attribute. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @see #isThreeWay() * @generated * @ordered @@ -107,9 +110,9 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { protected static final boolean THREE_WAY_EDEFAULT = false; /** - * The cached value of the '{@link #isThreeWay() <em>Three Way</em>}' attribute. - * <!-- begin-user-doc --> + * The cached value of the '{@link #isThreeWay() <em>Three Way</em>}' attribute. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @see #isThreeWay() * @generated * @ordered @@ -117,20 +120,22 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { protected boolean threeWay = THREE_WAY_EDEFAULT; /** - * The default value of the '{@link #getDiagnostic() <em>Diagnostic</em>}' attribute. - * <!-- begin-user-doc + * The default value of the '{@link #getDiagnostic() <em>Diagnostic</em>}' attribute. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @see #getDiagnostic() + * @since 4.0 * @generated * @ordered */ protected static final Diagnostic DIAGNOSTIC_EDEFAULT = null; /** - * The cached value of the '{@link #getDiagnostic() <em>Diagnostic</em>}' attribute. - * <!-- begin-user-doc + * The cached value of the '{@link #getDiagnostic() <em>Diagnostic</em>}' attribute. <!-- begin-user-doc * --> <!-- end-user-doc --> + * * @see #getDiagnostic() + * @since 4.0 * @generated * @ordered */ @@ -138,6 +143,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected ComparisonImpl() { @@ -146,6 +152,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -155,6 +162,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EList<MatchResource> getMatchedResources() { @@ -168,6 +176,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EList<Match> getMatches() { @@ -180,6 +189,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EList<Conflict> getConflicts() { @@ -192,6 +202,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EList<Equivalence> getEquivalences() { @@ -204,6 +215,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EList<Diff> getDifferences() { @@ -214,6 +226,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EList<Diff> getDifferences(EObject element) { @@ -224,6 +237,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public Match getMatch(EObject element) { @@ -234,6 +248,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public IEqualityHelper getEqualityHelper() { @@ -244,6 +259,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @SuppressWarnings("unchecked") @@ -259,6 +275,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public boolean isThreeWay() { @@ -267,18 +284,22 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void setThreeWay(boolean newThreeWay) { boolean oldThreeWay = threeWay; threeWay = newThreeWay; - if (eNotificationRequired()) + if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, ComparePackage.COMPARISON__THREE_WAY, oldThreeWay, threeWay)); + } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @since 4.0 * @generated */ public Diagnostic getDiagnostic() { @@ -287,18 +308,22 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @since 4.0 * @generated */ public void setDiagnostic(Diagnostic newDiagnostic) { Diagnostic oldDiagnostic = diagnostic; diagnostic = newDiagnostic; - if (eNotificationRequired()) + if (eNotificationRequired()) { eNotify(new ENotificationImpl(this, Notification.SET, ComparePackage.COMPARISON__DIAGNOSTIC, oldDiagnostic, diagnostic)); + } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -318,6 +343,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -341,6 +367,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @SuppressWarnings("unchecked") @@ -375,6 +402,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -404,6 +432,7 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -428,12 +457,14 @@ public class ComparisonImpl extends MinimalEObjectImpl implements Comparison { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override public String toString() { - if (eIsProxy()) + if (eIsProxy()) { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (threeWay: "); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java index bef6435f3..b6e4d4251 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,9 +14,7 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.compare.ComparePackage;
import org.eclipse.emf.compare.Conflict;
import org.eclipse.emf.compare.Diff;
@@ -25,56 +23,51 @@ import org.eclipse.emf.compare.DifferenceSource; import org.eclipse.emf.compare.DifferenceState;
import org.eclipse.emf.compare.Equivalence;
import org.eclipse.emf.compare.Match;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.InternalEList;
/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diff</b></em>'.
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Diff</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getMatch <em>Match</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getRequires <em>Requires</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getRequiredBy <em>Required By</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getImplies <em>Implies</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getImpliedBy <em>Implied By</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getRefines <em>Refines</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getRefinedBy <em>Refined By</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getPrimeRefining <em>Prime Refining</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getState <em>State</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getEquivalence <em>Equivalence</em>}</li>
- * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getConflict <em>Conflict</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getMatch <em>Match</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getRequires <em>Requires</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getRequiredBy <em>Required By</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getImplies <em>Implies</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getImpliedBy <em>Implied By</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getRefines <em>Refines</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getRefinedBy <em>Refined By</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getPrimeRefining <em>Prime Refining</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getState <em>State</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getEquivalence <em>Equivalence</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.impl.DiffImpl#getConflict <em>Conflict</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
// Supressing warnings : generated code
@SuppressWarnings("all")
public class DiffImpl extends MinimalEObjectImpl implements Diff {
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public static final String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$
/**
- * The cached value of the '{@link #getRequires() <em>Requires</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getRequires() <em>Requires</em>}' reference list. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @see #getRequires()
* @generated
* @ordered
@@ -82,9 +75,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected EList<Diff> requires;
/**
- * The cached value of the '{@link #getRequiredBy() <em>Required By</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getRequiredBy() <em>Required By</em>}' reference list. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getRequiredBy()
* @generated
* @ordered
@@ -92,29 +85,31 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected EList<Diff> requiredBy;
/**
- * The cached value of the '{@link #getImplies() <em>Implies</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getImplies() <em>Implies</em>}' reference list. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @see #getImplies()
+ * @since 4.0
* @generated
* @ordered
*/
protected EList<Diff> implies;
/**
- * The cached value of the '{@link #getImpliedBy() <em>Implied By</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getImpliedBy() <em>Implied By</em>}' reference list. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getImpliedBy()
+ * @since 4.0
* @generated
* @ordered
*/
protected EList<Diff> impliedBy;
/**
- * The cached value of the '{@link #getRefines() <em>Refines</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getRefines() <em>Refines</em>}' reference list. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @see #getRefines()
* @generated
* @ordered
@@ -122,9 +117,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected EList<Diff> refines;
/**
- * The cached value of the '{@link #getRefinedBy() <em>Refined By</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getRefinedBy() <em>Refined By</em>}' reference list. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getRefinedBy()
* @generated
* @ordered
@@ -132,19 +127,20 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected EList<Diff> refinedBy;
/**
- * The cached value of the '{@link #getPrimeRefining() <em>Prime Refining</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getPrimeRefining() <em>Prime Refining</em>}' reference. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #getPrimeRefining()
+ * @since 4.0
* @generated
* @ordered
*/
protected Diff primeRefining;
/**
- * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The default value of the '{@link #getKind() <em>Kind</em>}' attribute. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @see #getKind()
* @generated
* @ordered
@@ -152,9 +148,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected static final DifferenceKind KIND_EDEFAULT = DifferenceKind.ADD;
/**
- * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @see #getKind()
* @generated
* @ordered
@@ -162,9 +158,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected DifferenceKind kind = KIND_EDEFAULT;
/**
- * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The default value of the '{@link #getSource() <em>Source</em>}' attribute. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @see #getSource()
* @generated
* @ordered
@@ -172,9 +168,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected static final DifferenceSource SOURCE_EDEFAULT = DifferenceSource.LEFT;
/**
- * The cached value of the '{@link #getSource() <em>Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getSource() <em>Source</em>}' attribute. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @see #getSource()
* @generated
* @ordered
@@ -182,9 +178,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected DifferenceSource source = SOURCE_EDEFAULT;
/**
- * The default value of the '{@link #getState() <em>State</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The default value of the '{@link #getState() <em>State</em>}' attribute. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @see #getState()
* @generated
* @ordered
@@ -192,9 +188,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected static final DifferenceState STATE_EDEFAULT = DifferenceState.UNRESOLVED;
/**
- * The cached value of the '{@link #getState() <em>State</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getState() <em>State</em>}' attribute. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
* @see #getState()
* @generated
* @ordered
@@ -202,9 +198,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected DifferenceState state = STATE_EDEFAULT;
/**
- * The cached value of the '{@link #getEquivalence() <em>Equivalence</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * The cached value of the '{@link #getEquivalence() <em>Equivalence</em>}' reference. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
* @see #getEquivalence()
* @generated
* @ordered
@@ -212,9 +208,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected Equivalence equivalence;
/**
- * The cached value of the '{@link #getConflict() <em>Conflict</em>}' reference.
- * <!-- begin-user-doc -->
+ * The cached value of the '{@link #getConflict() <em>Conflict</em>}' reference. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @see #getConflict()
* @generated
* @ordered
@@ -222,8 +218,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { protected Conflict conflict;
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
protected DiffImpl() {
@@ -231,8 +227,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -241,19 +237,20 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Match getMatch() {
- if (eContainerFeatureID() != ComparePackage.DIFF__MATCH)
+ if (eContainerFeatureID() != ComparePackage.DIFF__MATCH) {
return null;
+ }
return (Match)eContainer();
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public NotificationChain basicSetMatch(Match newMatch, NotificationChain msgs) {
@@ -262,32 +259,37 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setMatch(Match newMatch) {
if (newMatch != eInternalContainer()
|| (eContainerFeatureID() != ComparePackage.DIFF__MATCH && newMatch != null)) {
- if (EcoreUtil.isAncestor(this, newMatch))
+ if (EcoreUtil.isAncestor(this, newMatch)) {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
+ }
NotificationChain msgs = null;
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
- if (newMatch != null)
+ }
+ if (newMatch != null) {
msgs = ((InternalEObject)newMatch).eInverseAdd(this, ComparePackage.MATCH__DIFFERENCES,
Match.class, msgs);
+ }
msgs = basicSetMatch(newMatch, msgs);
- if (msgs != null)
+ if (msgs != null) {
msgs.dispatch();
- } else if (eNotificationRequired())
+ }
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ComparePackage.DIFF__MATCH, newMatch,
newMatch));
+ }
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EList<Diff> getRequires() {
@@ -299,8 +301,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EList<Diff> getRequiredBy() {
@@ -312,8 +314,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @since 4.0
* @generated
*/
public EList<Diff> getImplies() {
@@ -325,8 +328,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @since 4.0
* @generated
*/
public EList<Diff> getImpliedBy() {
@@ -338,8 +342,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EList<Diff> getRefines() {
@@ -351,8 +355,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EList<Diff> getRefinedBy() {
@@ -364,8 +368,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @since 4.0
* @generated
*/
public Diff getPrimeRefining() {
@@ -373,17 +378,19 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { InternalEObject oldPrimeRefining = (InternalEObject)primeRefining;
primeRefining = (Diff)eResolveProxy(oldPrimeRefining);
if (primeRefining != oldPrimeRefining) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE,
ComparePackage.DIFF__PRIME_REFINING, oldPrimeRefining, primeRefining));
+ }
}
}
return primeRefining;
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @since 4.0
* @generated
*/
public Diff basicGetPrimeRefining() {
@@ -391,8 +398,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public DifferenceKind getKind() {
@@ -400,20 +407,21 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setKind(DifferenceKind newKind) {
DifferenceKind oldKind = kind;
kind = newKind == null ? KIND_EDEFAULT : newKind;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ComparePackage.DIFF__KIND, oldKind, kind));
+ }
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Conflict getConflict() {
@@ -421,17 +429,18 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { InternalEObject oldConflict = (InternalEObject)conflict;
conflict = (Conflict)eResolveProxy(oldConflict);
if (conflict != oldConflict) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, ComparePackage.DIFF__CONFLICT,
oldConflict, conflict));
+ }
}
}
return conflict;
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Conflict basicGetConflict() {
@@ -439,8 +448,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public NotificationChain basicSetConflict(Conflict newConflict, NotificationChain msgs) {
@@ -449,39 +458,44 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { if (eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
ComparePackage.DIFF__CONFLICT, oldConflict, newConflict);
- if (msgs == null)
+ if (msgs == null) {
msgs = notification;
- else
+ } else {
msgs.add(notification);
+ }
}
return msgs;
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setConflict(Conflict newConflict) {
if (newConflict != conflict) {
NotificationChain msgs = null;
- if (conflict != null)
+ if (conflict != null) {
msgs = ((InternalEObject)conflict).eInverseRemove(this, ComparePackage.CONFLICT__DIFFERENCES,
Conflict.class, msgs);
- if (newConflict != null)
+ }
+ if (newConflict != null) {
msgs = ((InternalEObject)newConflict).eInverseAdd(this, ComparePackage.CONFLICT__DIFFERENCES,
Conflict.class, msgs);
+ }
msgs = basicSetConflict(newConflict, msgs);
- if (msgs != null)
+ if (msgs != null) {
msgs.dispatch();
- } else if (eNotificationRequired())
+ }
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ComparePackage.DIFF__CONFLICT, newConflict,
newConflict));
+ }
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public DifferenceSource getSource() {
@@ -489,21 +503,22 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setSource(DifferenceSource newSource) {
DifferenceSource oldSource = source;
source = newSource == null ? SOURCE_EDEFAULT : newSource;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ComparePackage.DIFF__SOURCE, oldSource,
source));
+ }
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public DifferenceState getState() {
@@ -511,20 +526,21 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setState(DifferenceState newState) {
DifferenceState oldState = state;
state = newState == null ? STATE_EDEFAULT : newState;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ComparePackage.DIFF__STATE, oldState, state));
+ }
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Equivalence getEquivalence() {
@@ -532,17 +548,18 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { InternalEObject oldEquivalence = (InternalEObject)equivalence;
equivalence = (Equivalence)eResolveProxy(oldEquivalence);
if (equivalence != oldEquivalence) {
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE,
ComparePackage.DIFF__EQUIVALENCE, oldEquivalence, equivalence));
+ }
}
}
return equivalence;
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Equivalence basicGetEquivalence() {
@@ -550,8 +567,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public NotificationChain basicSetEquivalence(Equivalence newEquivalence, NotificationChain msgs) {
@@ -560,39 +577,44 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { if (eNotificationRequired()) {
ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
ComparePackage.DIFF__EQUIVALENCE, oldEquivalence, newEquivalence);
- if (msgs == null)
+ if (msgs == null) {
msgs = notification;
- else
+ } else {
msgs.add(notification);
+ }
}
return msgs;
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void setEquivalence(Equivalence newEquivalence) {
if (newEquivalence != equivalence) {
NotificationChain msgs = null;
- if (equivalence != null)
+ if (equivalence != null) {
msgs = ((InternalEObject)equivalence).eInverseRemove(this,
ComparePackage.EQUIVALENCE__DIFFERENCES, Equivalence.class, msgs);
- if (newEquivalence != null)
+ }
+ if (newEquivalence != null) {
msgs = ((InternalEObject)newEquivalence).eInverseAdd(this,
ComparePackage.EQUIVALENCE__DIFFERENCES, Equivalence.class, msgs);
+ }
msgs = basicSetEquivalence(newEquivalence, msgs);
- if (msgs != null)
+ if (msgs != null) {
msgs.dispatch();
- } else if (eNotificationRequired())
+ }
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ComparePackage.DIFF__EQUIVALENCE,
newEquivalence, newEquivalence));
+ }
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void copyRightToLeft() {
@@ -602,8 +624,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void copyLeftToRight() {
@@ -613,8 +635,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public void discard() {
@@ -624,8 +646,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -633,8 +655,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case ComparePackage.DIFF__MATCH:
- if (eInternalContainer() != null)
+ if (eInternalContainer() != null) {
msgs = eBasicRemoveFromContainer(msgs);
+ }
return basicSetMatch((Match)otherEnd, msgs);
case ComparePackage.DIFF__REQUIRES:
return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequires()).basicAdd(otherEnd,
@@ -655,22 +678,24 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { return ((InternalEList<InternalEObject>)(InternalEList<?>)getRefinedBy()).basicAdd(otherEnd,
msgs);
case ComparePackage.DIFF__EQUIVALENCE:
- if (equivalence != null)
+ if (equivalence != null) {
msgs = ((InternalEObject)equivalence).eInverseRemove(this,
ComparePackage.EQUIVALENCE__DIFFERENCES, Equivalence.class, msgs);
+ }
return basicSetEquivalence((Equivalence)otherEnd, msgs);
case ComparePackage.DIFF__CONFLICT:
- if (conflict != null)
+ if (conflict != null) {
msgs = ((InternalEObject)conflict).eInverseRemove(this,
ComparePackage.CONFLICT__DIFFERENCES, Conflict.class, msgs);
+ }
return basicSetConflict((Conflict)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -699,8 +724,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -714,8 +739,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -736,8 +761,9 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { case ComparePackage.DIFF__REFINED_BY:
return getRefinedBy();
case ComparePackage.DIFF__PRIME_REFINING:
- if (resolve)
+ if (resolve) {
return getPrimeRefining();
+ }
return basicGetPrimeRefining();
case ComparePackage.DIFF__KIND:
return getKind();
@@ -746,20 +772,22 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { case ComparePackage.DIFF__STATE:
return getState();
case ComparePackage.DIFF__EQUIVALENCE:
- if (resolve)
+ if (resolve) {
return getEquivalence();
+ }
return basicGetEquivalence();
case ComparePackage.DIFF__CONFLICT:
- if (resolve)
+ if (resolve) {
return getConflict();
+ }
return basicGetConflict();
}
return super.eGet(featureID, resolve, coreType);
}
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -813,8 +841,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -861,8 +889,8 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -899,14 +927,15 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { }
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
public String toString() {
- if (eIsProxy())
+ if (eIsProxy()) {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (kind: "); //$NON-NLS-1$
@@ -919,4 +948,4 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { return result.toString();
}
-} //DiffImpl
+} // DiffImpl
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties index 21ed24891..d12ec275a 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties @@ -24,3 +24,6 @@ ResourceAttachmentChangeSpec.MissingMatch = Could not locate resource match for ResourceAttachmentChangeSpec.MissingRS = Could not locate resource set to create {0} IMerger.MissingMerger = No merger found for diff {0} + +ProximityEObjectMatcher.monitor.indexing = indexing objects +ProximityEObjectMatcher.monitor.matching = matching objects
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/postprocessor/factories/AbstractChangeFactory.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/postprocessor/factories/AbstractChangeFactory.java index 07573df9f..fae53a253 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/postprocessor/factories/AbstractChangeFactory.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/postprocessor/factories/AbstractChangeFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -32,7 +32,7 @@ import org.eclipse.emf.compare.utils.MatchUtil; import org.eclipse.emf.ecore.EObject; /** - * Factory of diagram difference extensions. + * Factory of difference extensions. * * @author <a href="mailto:cedric.notot@obeo.fr">Cedric Notot</a> */ diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java index 718906a7a..5423d5e42 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -1060,25 +1060,6 @@ public final class DiffUtil { } /** - * Check if the given object is a Diff that is a prime refining of one of its refine diffs. - * - * @param data - * the given object. - * @return true if the given object is a Diff that is a prime refining of one of its refine diffs, false - * otherwise. - */ - public static boolean isPrimeRefining(EObject data) { - if (data instanceof Diff) { - for (Diff refine : ((Diff)data).getRefines()) { - if (refine.getPrimeRefining() == data) { - return true; - } - } - } - return false; - } - - /** * This can be used to check whether a given Diff affects a value for which we can find another, * unresolved Diff on a given Feature. * diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/CachingDistance.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/CachingDistance.java index b663540ec..c6d526977 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/CachingDistance.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/CachingDistance.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo and others. + * Copyright (c) 2012, 2014 Obeo and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.EObject; * same value will be returned to distance(b,a). * * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a> + * @since 4.0 */ public class CachingDistance implements DistanceFunction { @@ -54,7 +55,7 @@ public class CachingDistance implements DistanceFunction { Double previousResult = distanceCache.get(key); if (previousResult == null) { double dist = wrapped.distance(inProgress, a, b); - distanceCache.put(key, dist); + distanceCache.put(key, Double.valueOf(dist)); // cache it return dist; } diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EUriFragmentFunction.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EUriFragmentFunction.java index b3bbcac17..04408babd 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EUriFragmentFunction.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EUriFragmentFunction.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -56,23 +56,26 @@ public class EUriFragmentFunction implements Function<EObject, String> { // TODO Comment the checkstyle suppression. Was that copy/pasted from somewhere?
public String eURIFragmentSegment(EObject container, EStructuralFeature eStructuralFeature,
EObject eObject) {
- if (eStructuralFeature == null) {
+ EStructuralFeature actualFeature = eStructuralFeature;
+ if (actualFeature == null) {
for (@SuppressWarnings("unchecked")
EContentsEList.FeatureIterator<EObject> crossReferences = (EContentsEList.FeatureIterator<EObject>)((InternalEList<?>)container
.eCrossReferences()).basicIterator(); crossReferences.hasNext();) {
EObject crossReference = crossReferences.next();
if (crossReference == eObject) {
- eStructuralFeature = crossReferences.feature();
+ actualFeature = crossReferences.feature();
}
}
}
+ assert actualFeature != null;
+
StringBuilder result = new StringBuilder();
result.append('@');
- result.append(eStructuralFeature.getName());
+ result.append(actualFeature.getName());
- if (eStructuralFeature instanceof EAttribute) {
- FeatureMap featureMap = (FeatureMap)container.eGet(eStructuralFeature, false);
+ if (actualFeature instanceof EAttribute) {
+ FeatureMap featureMap = (FeatureMap)container.eGet(actualFeature, false);
for (int i = 0, size = featureMap.size(); i < size; ++i) {
if (featureMap.getValue(i) == eObject) {
EStructuralFeature entryFeature = featureMap.getEStructuralFeature(i);
@@ -83,11 +86,11 @@ public class EUriFragmentFunction implements Function<EObject, String> { }
}
}
- result.append(".-1");
- } else if (eStructuralFeature.isMany()) {
- EList<EAttribute> eKeys = ((EReference)eStructuralFeature).getEKeys();
+ result.append(".-1"); //$NON-NLS-1$
+ } else if (actualFeature.isMany()) {
+ EList<EAttribute> eKeys = ((EReference)actualFeature).getEKeys();
if (eKeys.isEmpty()) {
- EList<?> eList = (EList<?>)container.eGet(eStructuralFeature, false);
+ EList<?> eList = (EList<?>)container.eGet(actualFeature, false);
int index = eList.indexOf(eObject);
result.append('.');
result.append(index);
@@ -133,7 +136,7 @@ public class EUriFragmentFunction implements Function<EObject, String> { private void eEncodeValue(StringBuilder result, EFactory eFactory, EDataType eDataType, Object value) {
String stringValue = eFactory.convertToString(eDataType, value);
if (stringValue == null) {
- result.append("null");
+ result.append("null"); //$NON-NLS-1$
} else {
int length = stringValue.length();
result.ensureCapacity(result.length() + length + 2);
@@ -153,36 +156,7 @@ public class EUriFragmentFunction implements Function<EObject, String> { }
}
- /**
- * Returns the encoded value or the original, if no encoding was needed.
- *
- * @param value
- * the value to be encoded.
- * @return the encoded value or the original, if no encoding was needed.
- */
- private String eEncodeValue(String value) {
- int length = value.length();
- StringBuilder result = null;
- for (int i = 0; i < length; ++i) {
- char character = value.charAt(i);
- if (character < ESCAPE.length) {
- String escape = ESCAPE[character];
- if (escape != null) {
- if (result == null) {
- result = new StringBuilder(length + 2);
- result.append(value, 0, i);
- }
- result.append(escape);
- continue;
- }
- }
- if (result != null) {
- result.append(character);
- }
- }
- return result == null ? value : result.toString();
- }
-
+ @SuppressWarnings("nls")
private final String[] ESCAPE = {"%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09",
"%0A", "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
"%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F", "%20", null, "%22", "%23", null, "%25",
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java index 1eb2268e3..feda800a0 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ import org.eclipse.emf.common.util.BasicMonitor; import org.eclipse.emf.common.util.Monitor;
import org.eclipse.emf.compare.CompareFactory;
import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.EMFCompareMessages;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.match.eobject.EObjectIndex.Side;
import org.eclipse.emf.compare.match.eobject.internal.ByTypeIndex;
@@ -84,7 +85,7 @@ public class ProximityEObjectMatcher implements IEObjectMatcher, ScopeQuery { // FIXME: how to create an EMF submonitor
Monitor subMonitor = new BasicMonitor();
- subMonitor.beginTask("indexing objects", 1);
+ subMonitor.beginTask(EMFCompareMessages.getString("ProximityEObjectMatcher.monitor.indexing"), 1); //$NON-NLS-1$
int nbElements = 0;
int lastSegment = 0;
/*
@@ -123,7 +124,8 @@ public class ProximityEObjectMatcher implements IEObjectMatcher, ScopeQuery { // FIXME: how to create an EMF submonitor
subMonitor = new BasicMonitor();
- subMonitor.beginTask("matching objects", nbElements);
+ subMonitor.beginTask(EMFCompareMessages.getString("ProximityEObjectMatcher.monitor.matching"), //$NON-NLS-1$
+ nbElements);
matchIndexedObjects(comparison, subMonitor);
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ProximityMatchStats.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ProximityMatchStats.java index 080e707e4..798b2d064 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ProximityMatchStats.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ProximityMatchStats.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -118,6 +118,7 @@ public class ProximityMatchStats { * {@inheritDoc}
*/
@Override
+ @SuppressWarnings("nls")
public String toString() {
return "ProximityMatchStats [nbIndenticComparison=" + nbIndenticComparison + ", nbMaxDistComparison="
+ nbMaxDistComparison + ", nbnoMatch=" + nbNoMatch + ", nbSuccessIdenticComparison="
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ReflectiveWeightProvider.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ReflectiveWeightProvider.java index c0834d8cc..d785248fb 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ReflectiveWeightProvider.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ReflectiveWeightProvider.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -108,7 +108,7 @@ public class ReflectiveWeightProvider implements WeightProvider { * that it's important for matching the element. At some point I'll have to come up with something
* which is more extensible..
*/
- if ("name".equals(feature.getName()) || "id".equals(feature.getName())) { //$NON-NLS-1$
+ if ("name".equals(feature.getName()) || "id".equals(feature.getName())) { //$NON-NLS-1$ //$NON-NLS-2$
found = Integer.valueOf(SIGNIFICANT);
}
if (feature instanceof EReference && ((EReference)feature).isContainment()) {
@@ -116,11 +116,11 @@ public class ReflectiveWeightProvider implements WeightProvider { }
}
if (feature instanceof EReference) {
- found = referenceChangeCoef * found.intValue();
+ found = Integer.valueOf(referenceChangeCoef * found.intValue());
} else {
- found = attributeChangeCoef * found.intValue();
+ found = Integer.valueOf(attributeChangeCoef * found.intValue());
}
- return found;
+ return found.intValue();
}
/**
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java index 3d6e4cd1c..9579a1669 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,19 +10,19 @@ *******************************************************************************/ package org.eclipse.emf.compare.merge; -import static com.google.common.base.Predicates.in;
-import static com.google.common.collect.Iterables.any;
-
+import static com.google.common.base.Predicates.in; +import static com.google.common.collect.Iterables.any; + import java.util.List; import org.eclipse.emf.common.util.Monitor; import org.eclipse.emf.compare.Diff; -import org.eclipse.emf.compare.DifferenceSource;
-import org.eclipse.emf.compare.DifferenceState;
-import org.eclipse.emf.compare.ReferenceChange;
+import org.eclipse.emf.compare.DifferenceSource; +import org.eclipse.emf.compare.DifferenceState; +import org.eclipse.emf.compare.ReferenceChange; import org.eclipse.emf.compare.utils.EMFCompareCopier; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; @@ -80,116 +80,120 @@ public abstract class AbstractMerger implements IMerger { } /** - * {@inheritDoc}
- *
- * @see org.eclipse.emf.compare.merge.IMerger#copyLeftToRight(org.eclipse.emf.compare.Diff,
- * org.eclipse.emf.common.util.Monitor)
- */
- public void copyLeftToRight(Diff target, Monitor monitor) {
- // Don't merge an already merged (or discarded) diff
- if (target.getState() != DifferenceState.UNRESOLVED) {
- return;
- }
-
- // Change the diff's state before we actually merge it : this allows us to avoid requirement cycles.
- target.setState(DifferenceState.MERGED);
-
- if (target.getSource() == DifferenceSource.LEFT) {
- // merge all "requires" diffs
- mergeRequires(target, false, monitor);
- handleImplies(target, false, monitor);
- } else {
- // merge all "required by" diffs
- mergeRequiredBy(target, false, monitor);
- handleImpliedBy(target, false, monitor);
- }
-
- for (Diff refining : target.getRefinedBy()) {
- mergeDiff(refining, false, monitor);
- }
-
- boolean hasToBeMerged = true;
- if (target.getEquivalence() != null) {
- hasToBeMerged = handleEquivalences(target, false, monitor);
- }
-
- if (hasToBeMerged) {
- if (target.getSource() == DifferenceSource.LEFT) {
- accept(target, false);
- } else {
- reject(target, false);
- }
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.compare.merge.IMerger#copyRightToLeft(org.eclipse.emf.compare.Diff,
- * org.eclipse.emf.common.util.Monitor)
- */
- public void copyRightToLeft(Diff target, Monitor monitor) {
- // Don't merge an already merged (or discarded) diff
- if (target.getState() != DifferenceState.UNRESOLVED) {
- return;
- }
-
- // Change the diff's state before we actually merge it : this allows us to avoid requirement cycles.
- target.setState(DifferenceState.MERGED);
-
- if (target.getSource() == DifferenceSource.LEFT) {
- // merge all "required by" diffs
- mergeRequiredBy(target, true, monitor);
- handleImpliedBy(target, true, monitor);
- } else {
- // merge all "requires" diffs
- mergeRequires(target, true, monitor);
- handleImplies(target, true, monitor);
- }
-
- for (Diff refining : target.getRefinedBy()) {
- mergeDiff(refining, true, monitor);
- }
-
- boolean hasToBeMerged = true;
- if (target.getEquivalence() != null) {
- hasToBeMerged = handleEquivalences(target, true, monitor);
- }
-
- if (hasToBeMerged) {
- if (target.getSource() == DifferenceSource.LEFT) {
- reject(target, true);
- } else {
- accept(target, true);
- }
- }
- }
-
- /**
- * Accept the given difference. This may be overridden by clients.
- *
- * @param diff
- * the difference to merge
- * @param rightToLeft
- * the direction of the merge
- */
- protected void accept(final Diff diff, boolean rightToLeft) {
-
- }
-
- /**
- * Reject the given difference. This may be overridden by clients.
- *
- * @param diff
- * the difference to merge
- * @param rightToLeft
- * the direction of the merge
- */
- protected void reject(final Diff diff, boolean rightToLeft) {
-
- }
-
- /**
+ * {@inheritDoc} + * + * @see org.eclipse.emf.compare.merge.IMerger#copyLeftToRight(org.eclipse.emf.compare.Diff, + * org.eclipse.emf.common.util.Monitor) + * @since 4.0 + */ + public void copyLeftToRight(Diff target, Monitor monitor) { + // Don't merge an already merged (or discarded) diff + if (target.getState() != DifferenceState.UNRESOLVED) { + return; + } + + // Change the diff's state before we actually merge it : this allows us to avoid requirement cycles. + target.setState(DifferenceState.MERGED); + + if (target.getSource() == DifferenceSource.LEFT) { + // merge all "requires" diffs + mergeRequires(target, false, monitor); + handleImplies(target, false, monitor); + } else { + // merge all "required by" diffs + mergeRequiredBy(target, false, monitor); + handleImpliedBy(target, false, monitor); + } + + for (Diff refining : target.getRefinedBy()) { + mergeDiff(refining, false, monitor); + } + + boolean hasToBeMerged = true; + if (target.getEquivalence() != null) { + hasToBeMerged = handleEquivalences(target, false, monitor); + } + + if (hasToBeMerged) { + if (target.getSource() == DifferenceSource.LEFT) { + accept(target, false); + } else { + reject(target, false); + } + } + } + + /** + * {@inheritDoc} + * + * @see org.eclipse.emf.compare.merge.IMerger#copyRightToLeft(org.eclipse.emf.compare.Diff, + * org.eclipse.emf.common.util.Monitor) + * @since 4.0 + */ + public void copyRightToLeft(Diff target, Monitor monitor) { + // Don't merge an already merged (or discarded) diff + if (target.getState() != DifferenceState.UNRESOLVED) { + return; + } + + // Change the diff's state before we actually merge it : this allows us to avoid requirement cycles. + target.setState(DifferenceState.MERGED); + + if (target.getSource() == DifferenceSource.LEFT) { + // merge all "required by" diffs + mergeRequiredBy(target, true, monitor); + handleImpliedBy(target, true, monitor); + } else { + // merge all "requires" diffs + mergeRequires(target, true, monitor); + handleImplies(target, true, monitor); + } + + for (Diff refining : target.getRefinedBy()) { + mergeDiff(refining, true, monitor); + } + + boolean hasToBeMerged = true; + if (target.getEquivalence() != null) { + hasToBeMerged = handleEquivalences(target, true, monitor); + } + + if (hasToBeMerged) { + if (target.getSource() == DifferenceSource.LEFT) { + reject(target, true); + } else { + accept(target, true); + } + } + } + + /** + * Accept the given difference. This may be overridden by clients. + * + * @param diff + * the difference to merge + * @param rightToLeft + * the direction of the merge + * @since 4.0 + */ + protected void accept(final Diff diff, boolean rightToLeft) { + // Empty default implementation + } + + /** + * Reject the given difference. This may be overridden by clients. + * + * @param diff + * the difference to merge + * @param rightToLeft + * the direction of the merge + * @since 4.0 + */ + protected void reject(final Diff diff, boolean rightToLeft) { + // Empty default implementation + } + + /** * This will merge all {@link Diff#getRequiredBy() differences that require} {@code diff} in the given * direction. * @@ -210,42 +214,44 @@ public abstract class AbstractMerger implements IMerger { } /** - * Mark as {@link DifferenceState#MERGED merged} all the implied differences recursively from the given
- * one.
- *
- * @param diff
- * The difference from which the implications have to be marked.
- * @param rightToLeft
- * The direction of the merge.
- * @param monitor
- * Monitor.
- */
- protected void handleImplies(Diff diff, boolean rightToLeft, Monitor monitor) {
- for (Diff implied : diff.getImplies()) {
- implied.setState(DifferenceState.MERGED);
- handleImplies(implied, rightToLeft, monitor);
- }
- }
-
- /**
- * Mark as {@link DifferenceState#MERGED merged} all the implying differences recursively from the given
- * one.
- *
- * @param diff
- * The difference from which the implications have to be marked.
- * @param rightToLeft
- * The direction of the merge.
- * @param monitor
- * Monitor.
- */
- protected void handleImpliedBy(Diff diff, boolean rightToLeft, Monitor monitor) {
- for (Diff impliedBy : diff.getImpliedBy()) {
- impliedBy.setState(DifferenceState.MERGED);
- handleImpliedBy(impliedBy, rightToLeft, monitor);
- }
- }
-
- /**
+ * Mark as {@link DifferenceState#MERGED merged} all the implied differences recursively from the given + * one. + * + * @param diff + * The difference from which the implications have to be marked. + * @param rightToLeft + * The direction of the merge. + * @param monitor + * Monitor. + * @since 4.0 + */ + protected void handleImplies(Diff diff, boolean rightToLeft, Monitor monitor) { + for (Diff implied : diff.getImplies()) { + implied.setState(DifferenceState.MERGED); + handleImplies(implied, rightToLeft, monitor); + } + } + + /** + * Mark as {@link DifferenceState#MERGED merged} all the implying differences recursively from the given + * one. + * + * @param diff + * The difference from which the implications have to be marked. + * @param rightToLeft + * The direction of the merge. + * @param monitor + * Monitor. + * @since 4.0 + */ + protected void handleImpliedBy(Diff diff, boolean rightToLeft, Monitor monitor) { + for (Diff impliedBy : diff.getImpliedBy()) { + impliedBy.setState(DifferenceState.MERGED); + handleImpliedBy(impliedBy, rightToLeft, monitor); + } + } + + /** * This will merge all {@link Diff#getRequires() differences required by} {@code diff} in the given * direction. * @@ -287,71 +293,72 @@ public abstract class AbstractMerger implements IMerger { } /** - * Handles the equivalences of this difference.
- * <p>
- * Note that in certain cases, we'll merge our opposite instead of merging this diff. Specifically, we'll
- * do that for one-to-many eOpposites : we'll merge the 'many' side instead of the 'unique' one. This
- * allows us not to worry about the order of the references on that 'many' side.
- * </p>
- * <p>
- * This is called before the merge of <code>this</code>. In short, if this returns <code>false</code>, we
- * won't carry on merging <code>this</code> after returning.
- * </p>
- *
- * @param diff
- * The diff we are currently merging.
- * @param rightToLeft
- * Direction of the merge.
- * @param monitor
- * The monitor to use in order to report progress information.
- * @return <code>true</code> if the current difference should still be merged after handling its
- * equivalences, <code>false</code> if it should be considered "already merged".
- */
- protected boolean handleEquivalences(Diff diff, boolean rightToLeft, Monitor monitor) {
- boolean continueMerge = true;
- for (Diff equivalent : diff.getEquivalence().getDifferences()) {
- // For 1..*, merge diff on many-valued to preserve ordering
- if (diff instanceof ReferenceChange && equivalent instanceof ReferenceChange) {
- final EReference reference = ((ReferenceChange)diff).getReference();
- final EReference equivalentReference = ((ReferenceChange)equivalent).getReference();
-
- if (reference.getEOpposite() == equivalentReference
- && equivalent.getState() == DifferenceState.UNRESOLVED) {
- // This equivalence is on our eOpposite. Should we merge it instead of 'this'?
- final boolean mergeEquivalence = !reference.isMany()
- && ((ReferenceChange)equivalent).getReference().isMany();
- if (mergeEquivalence) {
- mergeDiff(equivalent, rightToLeft, monitor);
- continueMerge = false;
- }
- }
- }
-
- /*
- * If one of the equivalent differences is implied or implying (depending on the merge direction)
- * a merged diff, then we have a dependency loop : the "current" difference has already been
- * merged because of this implication. This will allow us to break out of that loop.
- */
- if (rightToLeft) {
- if (diff.getSource() == DifferenceSource.LEFT) {
- continueMerge = continueMerge && !any(equivalent.getImplies(), in(diff.getRequiredBy()));
- } else {
- continueMerge = continueMerge && !any(equivalent.getImpliedBy(), in(diff.getRequires()));
- }
- } else {
- if (diff.getSource() == DifferenceSource.LEFT) {
- continueMerge = continueMerge && !any(equivalent.getImpliedBy(), in(diff.getRequires()));
- } else {
- continueMerge = continueMerge && !any(equivalent.getImplies(), in(diff.getRequiredBy()));
- }
- }
-
- equivalent.setState(DifferenceState.MERGED);
- }
- return continueMerge;
- }
-
- /**
+ * Handles the equivalences of this difference. + * <p> + * Note that in certain cases, we'll merge our opposite instead of merging this diff. Specifically, we'll + * do that for one-to-many eOpposites : we'll merge the 'many' side instead of the 'unique' one. This + * allows us not to worry about the order of the references on that 'many' side. + * </p> + * <p> + * This is called before the merge of <code>this</code>. In short, if this returns <code>false</code>, we + * won't carry on merging <code>this</code> after returning. + * </p> + * + * @param diff + * The diff we are currently merging. + * @param rightToLeft + * Direction of the merge. + * @param monitor + * The monitor to use in order to report progress information. + * @return <code>true</code> if the current difference should still be merged after handling its + * equivalences, <code>false</code> if it should be considered "already merged". + * @since 4.0 + */ + protected boolean handleEquivalences(Diff diff, boolean rightToLeft, Monitor monitor) { + boolean continueMerge = true; + for (Diff equivalent : diff.getEquivalence().getDifferences()) { + // For 1..*, merge diff on many-valued to preserve ordering + if (diff instanceof ReferenceChange && equivalent instanceof ReferenceChange) { + final EReference reference = ((ReferenceChange)diff).getReference(); + final EReference equivalentReference = ((ReferenceChange)equivalent).getReference(); + + if (reference.getEOpposite() == equivalentReference + && equivalent.getState() == DifferenceState.UNRESOLVED) { + // This equivalence is on our eOpposite. Should we merge it instead of 'this'? + final boolean mergeEquivalence = !reference.isMany() + && ((ReferenceChange)equivalent).getReference().isMany(); + if (mergeEquivalence) { + mergeDiff(equivalent, rightToLeft, monitor); + continueMerge = false; + } + } + } + + /* + * If one of the equivalent differences is implied or implying (depending on the merge direction) + * a merged diff, then we have a dependency loop : the "current" difference has already been + * merged because of this implication. This will allow us to break out of that loop. + */ + if (rightToLeft) { + if (diff.getSource() == DifferenceSource.LEFT) { + continueMerge = continueMerge && !any(equivalent.getImplies(), in(diff.getRequiredBy())); + } else { + continueMerge = continueMerge && !any(equivalent.getImpliedBy(), in(diff.getRequires())); + } + } else { + if (diff.getSource() == DifferenceSource.LEFT) { + continueMerge = continueMerge && !any(equivalent.getImpliedBy(), in(diff.getRequires())); + } else { + continueMerge = continueMerge && !any(equivalent.getImplies(), in(diff.getRequiredBy())); + } + } + + equivalent.setState(DifferenceState.MERGED); + } + return continueMerge; + } + + /** * This will create a copy of the given EObject that can be used as the target of an addition (or the * reverting of a deletion). * <p> diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ConflictMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ConflictMerger.java index 7cba77e9b..15a7fe64b 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ConflictMerger.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ConflictMerger.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 Obeo. + * Copyright (c) 2013, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -25,7 +25,7 @@ import org.eclipse.emf.compare.EMFCompareMessages; * This specific implementation of {@link AbstractMerger} will be used to merge real conflicts. * * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a> - * @since 3.1 + * @since 4.0 */ public class ConflictMerger extends AbstractMerger { diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java index e4283c27a..400d3ee8a 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@ import org.eclipse.emf.compare.DifferenceSource; import org.eclipse.emf.compare.DifferenceState;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.utils.DiffUtil;
+import org.eclipse.emf.compare.internal.utils.DiffUtil;
import org.eclipse.emf.compare.utils.IEqualityHelper;
import org.eclipse.emf.compare.utils.ReferenceUtil;
import org.eclipse.emf.ecore.EObject;
@@ -529,6 +529,7 @@ public class ReferenceChangeMerger extends AbstractMerger { * The diff we are currently merging.
* @param rightToLeft
* Direction of the merge.
+ * @since 4.0
*/
protected void checkImpliedDiffsOrdering(ReferenceChange diff, boolean rightToLeft) {
final EReference reference = diff.getReference();
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java index a14620abe..d968db881 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012, 2014 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -199,7 +199,7 @@ public class ResourceAttachmentChangeMerger extends AbstractMerger { if (targetURI == null) {
// We treat null as "no valid target". We'll cancel the merge operation.
// FIXME we need to rollback the current merge operation.
- throw new RuntimeException("Couldn't create a valid target resource for "
+ throw new RuntimeException("Couldn't create a valid target resource for " //$NON-NLS-1$
+ sourceRes.getURI());
}
@@ -224,8 +224,8 @@ public class ResourceAttachmentChangeMerger extends AbstractMerger { // This resource might already exists... in which case we cannot use it
if (targetSet.getURIConverter().exists(targetURI, Collections.emptyMap())) {
// FIXME we need to rollback the current merge operation.
- throw new RuntimeException("The resource '" + sourceRes.getURI()
- + "' already exists at that location.");
+ throw new RuntimeException("The resource '" + sourceRes.getURI() //$NON-NLS-1$
+ + "' already exists at that location."); //$NON-NLS-1$
} else {
target = targetSet.createResource(targetURI);
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java index 365608b00..dea79bb0d 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -39,15 +39,22 @@ import org.eclipse.emf.ecore.EcorePackage; * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a> */ public final class EMFComparePredicates { - - /** This can be used to test whether a given Diff has no conflict object associated. */ + /** + * This can be used to test whether a given Diff has no conflict object associated. + * + * @since 4.0 + */ public static final Predicate<? super Diff> WITHOUT_CONFLICT = new Predicate<Diff>() { public boolean apply(Diff input) { return input != null && input.getConflict() == null; } }; - /** This can be used to check whether a given diff is a containment reference change. */ + /** + * This can be used to check whether a given diff is a containment reference change. + * + * @since 4.0 + */ public static final Predicate<? super Diff> CONTAINMENT_REFERENCE_CHANGE = new Predicate<Diff>() { public boolean apply(Diff input) { return input instanceof ReferenceChange @@ -774,18 +781,6 @@ public final class EMFComparePredicates { } /** - * This can be used to check whether a given diff is a containment move reference change. - * - * @return The created predicate. - * @since 3.0 - * @deprecated use and(CONTAINMENT_REFERENCE_CHANGE, ofKind(DifferenceKind.MOVE)) instead. - */ - @Deprecated - public static Predicate<? super Diff> containmentMoveReferenceChange() { - return and(CONTAINMENT_REFERENCE_CHANGE, ofKind(DifferenceKind.MOVE)); - } - - /** * This will be used to check that a given {@link EObject} corresponds to the given {@code qualifiedName}. * <p> * For example, {@code match("extlibrary.BookCategory.Encyclopedia")} will return {@code true} for an |