Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.compare')
-rw-r--r--plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.emf.compare/pom.xml4
-rw-r--r--plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/ComparePackage.java786
-rw-r--r--plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Comparison.java41
-rw-r--r--plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Diff.java291
-rw-r--r--plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java132
-rw-r--r--plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparisonImpl.java73
-rw-r--r--plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java383
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/emfcomparemessages.properties3
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/postprocessor/factories/AbstractChangeFactory.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java21
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/CachingDistance.java5
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EUriFragmentFunction.java56
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java8
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ProximityMatchStats.java3
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/internal/ReflectiveWeightProvider.java10
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java445
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ConflictMerger.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java5
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java8
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java27
21 files changed, 1262 insertions, 1056 deletions
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

Back to the top