diff options
| author | Mikaël Barbero | 2013-03-11 15:39:24 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2013-03-11 15:39:24 +0000 |
| commit | 1b2872bb53b35ee52787b59d2402cfb35a8a1912 (patch) | |
| tree | 70c17326e1a85453bc306c95e8b9d9fc99cd42a9 | |
| parent | 8f740e78d335ad5ff6ab8b2d3c4381a820e52fdf (diff) | |
| download | org.eclipse.emf.compare-1b2872bb53b35ee52787b59d2402cfb35a8a1912.tar.gz org.eclipse.emf.compare-1b2872bb53b35ee52787b59d2402cfb35a8a1912.tar.xz org.eclipse.emf.compare-1b2872bb53b35ee52787b59d2402cfb35a8a1912.zip | |
refactor UML plugins to make all classes internal before kepler m6
119 files changed, 1441 insertions, 1244 deletions
diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml index f60e3c7f6..418000ccd 100644 --- a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml +++ b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml @@ -39,7 +39,7 @@ unpack="false"/> <plugin - id="org.eclipse.emf.compare.uml2.ide.ui" + id="org.eclipse.emf.compare.uml2.ide.ui.internal" download-size="0" install-size="0" version="0.0.0" diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java index 605b753cd..fddee6b7c 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java @@ -10,8 +10,6 @@ *******************************************************************************/
package org.eclipse.emf.compare.diagram.ecoretools.tests.merge;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import org.eclipse.emf.common.notify.Notifier;
@@ -31,11 +29,13 @@ import org.eclipse.emf.compare.merge.IMerger; import org.eclipse.emf.compare.merge.ReferenceChangeMerger;
import org.eclipse.emf.compare.merge.ResourceAttachmentChangeMerger;
import org.eclipse.emf.compare.scope.IComparisonScope;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.merge.UMLDiffMerger;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.merge.UMLMerger;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
@SuppressWarnings("nls")
public class ExtensionMergeTest extends AbstractTest {
private EdgeChangesInputData input = new EdgeChangesInputData();
@@ -54,7 +54,7 @@ public class ExtensionMergeTest extends AbstractTest { final Comparison comparisonBefore = getCompare().compare(scope);
EList<Diff> differences = comparisonBefore.getDifferences();
final IMerger.Registry registry = IMerger.RegistryImpl.createStandaloneInstance();
- final IMerger umlMerger = new UMLDiffMerger();
+ final IMerger umlMerger = new UMLMerger();
umlMerger.setRanking(11);
final IMerger diagramMerger = new CompareDiagramMerger();
diagramMerger.setRanking(11);
@@ -65,7 +65,7 @@ public class ExtensionMergeTest extends AbstractTest { if (diff instanceof DiagramDiff) {
expectedMerger = CompareDiagramMerger.class;
} else if (diff instanceof UMLDiff) {
- expectedMerger = UMLDiffMerger.class;
+ expectedMerger = UMLMerger.class;
} else if (diff instanceof AttributeChange) {
expectedMerger = AttributeChangeMerger.class;
} else if (diff instanceof ReferenceChange) {
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF index e57f8ca77..eefca73df 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.compare.uml2.edit;singleton:=true Bundle-Version: 2.1.0.qualifier Bundle-ClassPath: . -Bundle-Activator: org.eclipse.emf.compare.uml2.provider.UMLCompareEditPlugin$Implementation +Bundle-Activator: org.eclipse.emf.compare.uml2.internal.provider.UMLCompareEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -20,4 +20,5 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-ActivationPolicy: lazy Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", org.eclipse.emf.compare.provider -Export-Package: org.eclipse.emf.compare.uml2.provider +Export-Package: org.eclipse.emf.compare.uml2.internal.provider;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.provider.spec;x-internal:=true diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.xml b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.xml index 400963291..caaf319c1 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.xml +++ b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.xml @@ -17,7 +17,7 @@ Contributors: <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories"> <factory uri="http://www.eclipse.org/emf/compare/uml2/2.0" - class="org.eclipse.emf.compare.uml2.provider.spec.UMLCompareAdapterFactorySpec" + class="org.eclipse.emf.compare.uml2.internal.provider.spec.UMLCompareAdapterFactorySpec" supportedTypes= "org.eclipse.emf.edit.provider.IEditingDomainItemProvider org.eclipse.emf.edit.provider.IStructuredItemContentProvider diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/AssociationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/AssociationChangeItemProvider.java index 5aa16bf75..b5ef691cf 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/AssociationChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/AssociationChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,10 +19,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.AssociationChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.AssociationChange;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -33,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.AssociationChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.AssociationChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -41,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class AssociationChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/DependencyChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DependencyChangeItemProvider.java index 8dc4f7aa4..b7eab38d4 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/DependencyChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DependencyChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,10 +19,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.DependencyChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -33,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.DependencyChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.DependencyChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -41,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class DependencyChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExecutionSpecificationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExecutionSpecificationChangeItemProvider.java index 7cbfb0b3d..f85a12e8d 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExecutionSpecificationChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExecutionSpecificationChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;
+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.ExecutionSpecificationChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -39,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class ExecutionSpecificationChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExtendChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExtendChangeItemProvider.java index d274e1287..4a86256ba 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExtendChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExtendChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,10 +19,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.ExtendChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.ExtendChange;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -33,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.ExtendChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.ExtendChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -41,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class ExtendChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/GeneralizationSetChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/GeneralizationSetChangeItemProvider.java index 9d2e39d27..fb073d178 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/GeneralizationSetChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/GeneralizationSetChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,10 +19,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.GeneralizationSetChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -33,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.GeneralizationSetChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -41,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class GeneralizationSetChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IncludeChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IncludeChangeItemProvider.java index 07dea52b9..863c62280 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IncludeChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IncludeChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.IncludeChange;
+import org.eclipse.emf.compare.uml2.internal.IncludeChange;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.IncludeChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.IncludeChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -39,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class IncludeChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/InterfaceRealizationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/InterfaceRealizationChangeItemProvider.java index b4a3f5ff8..47e04b636 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/InterfaceRealizationChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/InterfaceRealizationChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;
+import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.InterfaceRealizationChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -39,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class InterfaceRealizationChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IntervalConstraintChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IntervalConstraintChangeItemProvider.java index 9327eeee2..970f0c823 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IntervalConstraintChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IntervalConstraintChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.IntervalConstraintChange;
+import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.IntervalConstraintChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -39,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class IntervalConstraintChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/MessageChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/MessageChangeItemProvider.java index 540b9e427..8f06dd784 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/MessageChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/MessageChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.MessageChange;
+import org.eclipse.emf.compare.uml2.internal.MessageChange;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.MessageChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.MessageChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -39,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class MessageChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ProfileApplicationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ProfileApplicationChangeItemProvider.java index f3e45200c..85ae4fa86 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ProfileApplicationChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ProfileApplicationChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -17,14 +17,10 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.provider.ReferenceChangeItemProvider;
-
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -37,7 +33,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.ProfileApplicationChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -45,7 +41,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class ProfileApplicationChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeApplicationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeApplicationChangeItemProvider.java index 641a72e2d..88bbf78c7 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeApplicationChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeApplicationChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -17,14 +17,10 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.provider.ReferenceChangeItemProvider;
-
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -37,7 +33,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.StereotypeApplicationChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -45,7 +41,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class StereotypeApplicationChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypePropertyChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypePropertyChangeItemProvider.java index fb3e53231..347c2eccb 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypePropertyChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypePropertyChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,8 +19,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.StereotypePropertyChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -33,7 +33,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.StereotypePropertyChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -41,7 +41,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class StereotypePropertyChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeReferenceChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeReferenceChangeItemProvider.java index b007c7652..005a785a7 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeReferenceChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeReferenceChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.StereotypeReferenceChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -39,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class StereotypeReferenceChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/SubstitutionChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/SubstitutionChangeItemProvider.java index 7640865c3..9c93d150b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/SubstitutionChangeItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/SubstitutionChangeItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -19,7 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.compare.DifferenceKind;
-import org.eclipse.emf.compare.uml2.SubstitutionChange;
+import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.SubstitutionChange} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -39,7 +39,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class SubstitutionChangeItemProvider
extends UMLDiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLCompareEditPlugin.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareEditPlugin.java index 32007431b..40849e325 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLCompareEditPlugin.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareEditPlugin.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import org.eclipse.emf.common.EMFPlugin;
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLCompareItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java index 374adf2e4..ef26ed8c4 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLCompareItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.ArrayList;
import java.util.Collection;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.compare.uml2.util.UMLCompareAdapterFactory;
+import org.eclipse.emf.compare.uml2.internal.util.UMLCompareAdapterFactory;
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
@@ -84,7 +84,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.AssociationChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.AssociationChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -92,7 +92,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected AssociationChangeItemProvider associationChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.AssociationChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.AssociationChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -107,7 +107,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.DependencyChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.DependencyChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -115,7 +115,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected DependencyChangeItemProvider dependencyChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.DependencyChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.DependencyChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -130,7 +130,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.InterfaceRealizationChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -138,7 +138,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected InterfaceRealizationChangeItemProvider interfaceRealizationChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.InterfaceRealizationChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -153,7 +153,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.SubstitutionChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -161,7 +161,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected SubstitutionChangeItemProvider substitutionChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.SubstitutionChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -176,7 +176,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.ExtendChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.ExtendChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -184,7 +184,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected ExtendChangeItemProvider extendChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.ExtendChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.ExtendChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -199,7 +199,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.IncludeChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.IncludeChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -207,7 +207,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected IncludeChangeItemProvider includeChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.IncludeChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.IncludeChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -222,7 +222,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.GeneralizationSetChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -230,7 +230,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected GeneralizationSetChangeItemProvider generalizationSetChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.GeneralizationSetChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -245,7 +245,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.ExecutionSpecificationChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -253,7 +253,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected ExecutionSpecificationChangeItemProvider executionSpecificationChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.ExecutionSpecificationChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -268,7 +268,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.IntervalConstraintChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -276,7 +276,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected IntervalConstraintChangeItemProvider intervalConstraintChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.IntervalConstraintChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -291,7 +291,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.MessageChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.MessageChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -299,7 +299,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected MessageChangeItemProvider messageChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.MessageChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.MessageChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -314,7 +314,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.StereotypePropertyChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -322,7 +322,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected StereotypePropertyChangeItemProvider stereotypePropertyChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.StereotypePropertyChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -337,7 +337,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.StereotypeApplicationChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -345,7 +345,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected StereotypeApplicationChangeItemProvider stereotypeApplicationChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.StereotypeApplicationChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -360,7 +360,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.StereotypeReferenceChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -368,7 +368,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected StereotypeReferenceChangeItemProvider stereotypeReferenceChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.StereotypeReferenceChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -383,7 +383,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto }
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.ProfileApplicationChange} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -391,7 +391,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto protected ProfileApplicationChangeItemProvider profileApplicationChangeItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.ProfileApplicationChange}.
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLDiffItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLDiffItemProvider.java index cc4105021..dafca1c15 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLDiffItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLDiffItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.provider;
+package org.eclipse.emf.compare.uml2.internal.provider;
import java.util.Collection;
@@ -23,8 +23,8 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.provider.DiffItemProvider;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
@@ -37,7 +37,7 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.UMLDiff} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.UMLDiff} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -45,7 +45,13 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; public class UMLDiffItemProvider
extends DiffItemProvider
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource,
+ IItemColorProvider,
+ IItemFontProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/provider/spec/ForwardingUMLDiffItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/ForwardingUMLDiffItemProvider.java index 1b4b0602e..12ca9cd8a 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/provider/spec/ForwardingUMLDiffItemProvider.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/ForwardingUMLDiffItemProvider.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.provider.spec;
+package org.eclipse.emf.compare.uml2.internal.provider.spec;
import java.util.Collection;
@@ -22,7 +22,7 @@ import org.eclipse.emf.compare.provider.spec.Strings; import org.eclipse.emf.compare.provider.utils.ComposedStyledString;
import org.eclipse.emf.compare.provider.utils.IStyledString;
import org.eclipse.emf.compare.provider.utils.IStyledString.Style;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/provider/spec/StereotypeApplicationChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/StereotypeApplicationChangeItemProviderSpec.java index ca29c82f4..49f294d85 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/provider/spec/StereotypeApplicationChangeItemProviderSpec.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/StereotypeApplicationChangeItemProviderSpec.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.provider.spec;
+package org.eclipse.emf.compare.uml2.internal.provider.spec;
import java.util.Collection;
@@ -21,9 +21,9 @@ import org.eclipse.emf.compare.provider.IItemStyledLabelProvider; import org.eclipse.emf.compare.provider.utils.ComposedStyledString;
import org.eclipse.emf.compare.provider.utils.IStyledString;
import org.eclipse.emf.compare.provider.utils.IStyledString.Style;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.provider.StereotypeApplicationChangeItemProvider;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.provider.StereotypeApplicationChangeItemProvider;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/provider/spec/UMLCompareAdapterFactorySpec.java b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/UMLCompareAdapterFactorySpec.java index 8a3971744..307df48ea 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/provider/spec/UMLCompareAdapterFactorySpec.java +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/UMLCompareAdapterFactorySpec.java @@ -8,12 +8,12 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.provider.spec;
+package org.eclipse.emf.compare.uml2.internal.provider.spec;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.compare.provider.IItemStyledLabelProvider;
-import org.eclipse.emf.compare.uml2.provider.StereotypeApplicationChangeItemProvider;
-import org.eclipse.emf.compare.uml2.provider.UMLCompareItemProviderAdapterFactory;
+import org.eclipse.emf.compare.uml2.internal.provider.StereotypeApplicationChangeItemProvider;
+import org.eclipse.emf.compare.uml2.internal.provider.UMLCompareItemProviderAdapterFactory;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.ide.ui/META-INF/MANIFEST.MF index 597f97259..a9b9dd1be 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.emf.compare.uml2.ide.ui;singleton:=true +Bundle-SymbolicName: org.eclipse.emf.compare.uml2.ide.ui.internal;singleton:=true Bundle-Version: 2.1.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.uml2.ide.ui/plugin.xml index 7bf0a7aaf..d635c164c 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/plugin.xml +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/plugin.xml @@ -20,7 +20,7 @@ point="org.eclipse.emf.compare.rcp.ui.filters"> <filter activeByDefault="true" - class="org.eclipse.emf.compare.uml2.ide.ui.structuremergeviewer.filters.UMLRefinedElementsFilter" + class="org.eclipse.emf.compare.uml2.ide.ui.internal.structuremergeviewer.filters.UMLRefinedElementsFilter" label="UML refined elements"> </filter> </extension> diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLIDEManyStructuralFeatureAccessor.java b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLIDEManyStructuralFeatureAccessor.java index ec3e96499..9a1387c9b 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLIDEManyStructuralFeatureAccessor.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLIDEManyStructuralFeatureAccessor.java @@ -25,7 +25,7 @@ import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.accessor.IDEManyStructuralFeatureAccessorImpl;
import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLIDESingleStructuralFeatureAccessor.java b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLIDESingleStructuralFeatureAccessor.java index c308674b9..065ee0900 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLIDESingleStructuralFeatureAccessor.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLIDESingleStructuralFeatureAccessor.java @@ -15,7 +15,7 @@ import com.google.common.collect.ImmutableList; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.accessor.IDESingleStructuralFeatureAccessorImpl;
import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
import org.eclipse.emf.ecore.EStructuralFeature;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLStereotypeApplicationChangeFeatureAccessor.java b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLStereotypeApplicationChangeFeatureAccessor.java index ed2fea167..fe38606a0 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLStereotypeApplicationChangeFeatureAccessor.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/UMLStereotypeApplicationChangeFeatureAccessor.java @@ -27,7 +27,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.DifferenceState;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
import org.eclipse.emf.compare.utils.DiffUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLIDEManyStructuralFeatureAccessorFactory.java b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLIDEManyStructuralFeatureAccessorFactory.java index 29b9effa9..e92a487e4 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLIDEManyStructuralFeatureAccessorFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLIDEManyStructuralFeatureAccessorFactory.java @@ -14,8 +14,8 @@ import org.eclipse.compare.ITypedElement; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.accessor.IAccessorFactory.AbstractAccessorFactory;
import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
-import org.eclipse.emf.compare.uml2.UMLDiff;
import org.eclipse.emf.compare.uml2.ide.ui.internal.accessor.UMLIDEManyStructuralFeatureAccessor;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLIDESingleStructuralFeatureAccessorFactory.java b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLIDESingleStructuralFeatureAccessorFactory.java index 38260d9af..7fb2d9f98 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLIDESingleStructuralFeatureAccessorFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLIDESingleStructuralFeatureAccessorFactory.java @@ -14,8 +14,8 @@ import org.eclipse.compare.ITypedElement; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.accessor.IAccessorFactory.AbstractAccessorFactory;
import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
-import org.eclipse.emf.compare.uml2.UMLDiff;
import org.eclipse.emf.compare.uml2.ide.ui.internal.accessor.UMLIDESingleStructuralFeatureAccessor;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLStereotypeApplicationChangeFeatureAccessorFactory.java b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLStereotypeApplicationChangeFeatureAccessorFactory.java index 67fb08c6e..40faac977 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLStereotypeApplicationChangeFeatureAccessorFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/accessor/factory/UMLStereotypeApplicationChangeFeatureAccessorFactory.java @@ -14,8 +14,8 @@ import org.eclipse.compare.ITypedElement; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.accessor.IAccessorFactory.AbstractAccessorFactory;
import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
import org.eclipse.emf.compare.uml2.ide.ui.internal.accessor.UMLStereotypeApplicationChangeFeatureAccessor;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
/**
* This will be in charge of creating the accessor for stereotype changes.
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/structuremergeviewer/filters/UMLRefinedElementsFilter.java b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/structuremergeviewer/filters/UMLRefinedElementsFilter.java index 108240cce..6c7e8d574 100644 --- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/structuremergeviewer/filters/UMLRefinedElementsFilter.java +++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/src/org/eclipse/emf/compare/uml2/ide/ui/internal/structuremergeviewer/filters/UMLRefinedElementsFilter.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2.ide.ui.structuremergeviewer.filters; +package org.eclipse.emf.compare.uml2.ide.ui.internal.structuremergeviewer.filters; import static com.google.common.base.Predicates.instanceOf; @@ -19,7 +19,7 @@ import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.filters.AbstractDifferenceFilter; import org.eclipse.emf.compare.scope.IComparisonScope; -import org.eclipse.emf.compare.uml2.UMLDiff; +import org.eclipse.emf.compare.uml2.internal.UMLDiff; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java index aab74699b..04e1bba85 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java @@ -34,8 +34,8 @@ import org.eclipse.emf.compare.merge.IMerger; import org.eclipse.emf.compare.postprocessor.PostProcessorRegistryImpl;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.diff.UMLDiffExtensionPostProcessor;
-import org.eclipse.emf.compare.uml2.merge.UMLDiffMerger;
+import org.eclipse.emf.compare.uml2.internal.merge.UMLMerger;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.UMLPostProcessor;
import org.eclipse.emf.compare.utils.ReferenceUtil;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -60,7 +60,7 @@ public abstract class AbstractTest { Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("uml", //$NON-NLS-1$
new UMLResourceFactoryImpl());
- final IMerger umlMerger = new UMLDiffMerger();
+ final IMerger umlMerger = new UMLMerger();
umlMerger.setRanking(11);
mergerRegistry.add(umlMerger);
}
@@ -68,7 +68,7 @@ public abstract class AbstractTest { @Before
public void before() {
PostProcessorRegistryImpl registry = new PostProcessorRegistryImpl();
- registry.addPostProcessor(new UMLDiffExtensionPostProcessor(Pattern
+ registry.addPostProcessor(new UMLPostProcessor(Pattern
.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null));
emfCompare = EMFCompare.builder().setPostProcessorRegistry(registry).build();
}
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java index 49e84d18c..36e53f4b2 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java @@ -26,7 +26,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.AssociationChange;
+import org.eclipse.emf.compare.uml2.internal.AssociationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java index b1b48c014..32cee2c25 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java @@ -26,7 +26,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.AssociationChange;
+import org.eclipse.emf.compare.uml2.internal.AssociationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java index e23ee5c42..e19c28084 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java @@ -26,7 +26,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.AssociationChange;
+import org.eclipse.emf.compare.uml2.internal.AssociationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java index 70b0af205..4aa5091f4 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java @@ -24,7 +24,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.AssociationChange;
+import org.eclipse.emf.compare.uml2.internal.AssociationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java index 5ccf4bb79..d16d28538 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java @@ -23,7 +23,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java index 768efe1cd..48c0bef06 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java @@ -23,7 +23,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java index 0a4309750..ff4a3c8da 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java @@ -22,7 +22,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;
+import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java index 84cc9edd5..8250113f9 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java @@ -23,7 +23,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java index e52b5d3ca..9cdb8a30d 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java @@ -22,7 +22,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.SubstitutionChange;
+import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java index 82ad2b6f4..05b990ddf 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java @@ -23,7 +23,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java index e83c37572..a3c995ac4 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java @@ -21,7 +21,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java index 5a78d8163..0352225ef 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java @@ -21,7 +21,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java index 1c5066d78..c7de432cb 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java @@ -24,7 +24,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;
+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.executionSpecification.data.ExecutionSpecificationInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java index cb86d2234..c60c78c58 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java @@ -24,7 +24,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;
+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.executionSpecification.data.ExecutionSpecificationInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java index 77740c96a..77add5d82 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java @@ -24,7 +24,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.ExtendChange;
+import org.eclipse.emf.compare.uml2.internal.ExtendChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.extend.data.ExtendInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java index f1b009b7a..d65c488d6 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java @@ -23,7 +23,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.GeneralizationSetChange;
+import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.generalizationSet.data.GeneralizationSetInputData;
import org.eclipse.emf.ecore.EStructuralFeature;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java index 252f64e41..323cfd708 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java @@ -22,7 +22,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.IncludeChange;
+import org.eclipse.emf.compare.uml2.internal.IncludeChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.include.data.IncludeInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java index 712ee1390..eca9b637e 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java @@ -27,8 +27,8 @@ import org.eclipse.emf.compare.merge.ReferenceChangeMerger; import org.eclipse.emf.compare.merge.ResourceAttachmentChangeMerger;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.merge.UMLDiffMerger;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.merge.UMLMerger;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
@@ -58,13 +58,13 @@ public class ExtensionMergeTest extends AbstractTest { final Comparison comparisonBefore = getCompare().compare(scope);
EList<Diff> differences = comparisonBefore.getDifferences();
final IMerger.Registry registry = IMerger.RegistryImpl.createStandaloneInstance();
- final IMerger umlMerger = new UMLDiffMerger();
+ final IMerger umlMerger = new UMLMerger();
umlMerger.setRanking(11);
registry.add(umlMerger);
for (Diff diff : differences) {
final Class<? extends IMerger> expectedMerger;
if (diff instanceof UMLDiff) {
- expectedMerger = UMLDiffMerger.class;
+ expectedMerger = UMLMerger.class;
} else if (diff instanceof AttributeChange) {
expectedMerger = AttributeChangeMerger.class;
} else if (diff instanceof ReferenceChange) {
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java index 2409e1860..04d7f8a25 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java @@ -28,7 +28,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.MessageChange;
+import org.eclipse.emf.compare.uml2.internal.MessageChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.message.data.MessageInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java index 0ae700072..baab33156 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java @@ -21,7 +21,7 @@ import org.eclipse.emf.compare.EMFCompare; import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.profiles.data.dynamic.DynamicProfileInputData;
import org.eclipse.emf.compare.uml2.tests.profiles.data.static_.StaticProfileInputData;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java index 74e7387d4..3e3d173eb 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java @@ -27,8 +27,8 @@ import org.eclipse.emf.compare.ReferenceChange; import org.eclipse.emf.compare.ResourceAttachmentChange;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.stereotypes.data.dynamic.DynamicStereotypeInputData;
import org.eclipse.emf.ecore.EcorePackage;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java index 434dc4007..50da7ec85 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java @@ -27,8 +27,8 @@ import org.eclipse.emf.compare.ReferenceChange; import org.eclipse.emf.compare.ResourceAttachmentChange;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.stereotypes.data.static_.StaticStereotypeInputData;
import org.eclipse.emf.ecore.EcorePackage;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java index 9a3f56654..10bf1b50a 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java @@ -24,7 +24,7 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
-import org.eclipse.emf.compare.uml2.IntervalConstraintChange;
+import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.timeConstraint.data.TimeConstraintInputData;
import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF index aa5906613..ed7980cc8 100644 --- a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF @@ -10,21 +10,20 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.uml2.uml;bundle-version="4.0.0", - org.eclipse.emf.compare, - org.eclipse.emf.compare.ide + org.eclipse.emf.compare Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.emf.compare.uml2, - org.eclipse.emf.compare.uml2.diff, - org.eclipse.emf.compare.uml2.diff.internal.extension;x-internal:=true, - org.eclipse.emf.compare.uml2.diff.internal.extension.clazz;x-internal:=true, - org.eclipse.emf.compare.uml2.diff.internal.extension.profile;x-internal:=true, - org.eclipse.emf.compare.uml2.diff.internal.extension.sequence;x-internal:=true, - org.eclipse.emf.compare.uml2.diff.internal.extension.usecase;x-internal:=true, - org.eclipse.emf.compare.uml2.diff.internal.util;x-friends:="org.eclipse.emf.compare.uml2.edit", - org.eclipse.emf.compare.uml2.impl, - org.eclipse.emf.compare.uml2.merge, - org.eclipse.emf.compare.uml2.util -Bundle-Activator: org.eclipse.emf.compare.uml2.UMLDiffEnginePlugin +Bundle-Activator: org.eclipse.emf.compare.uml2.internal.UMLComparePlugin Import-Package: com.google.common.base;version="[11.0.0,15.0.0)", com.google.common.collect;version="[11.0.0,15.0.0)", com.google.common.primitives;version="[11.0.0,15.0.0)" +Export-Package: org.eclipse.emf.compare.uml2.internal;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.impl;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.merge;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.postprocessor;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.postprocessor.extension;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.postprocessor.extension.profile;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.postprocessor.util;x-internal:=true, + org.eclipse.emf.compare.uml2.internal.util;x-internal:=true diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2diff.ecore b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore index 078cfcad7..078cfcad7 100644 --- a/plugins/org.eclipse.emf.compare.uml2/model/uml2diff.ecore +++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2diff.genmodel b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel index da6f42f9c..24de0b4be 100644 --- a/plugins/org.eclipse.emf.compare.uml2/model/uml2diff.genmodel +++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel @@ -1,43 +1,46 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
- copyrightText="Copyright (c) 2012 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
 Obeo - initial API and implementation"
- modelDirectory="/org.eclipse.emf.compare.uml2/src-gen" editDirectory="/org.eclipse.emf.compare.uml2.edit/src-gen"
- modelPluginID="org.eclipse.emf.compare.uml2" modelName="Uml2" editPluginClass="org.eclipse.emf.compare.uml2.provider.UMLCompareEditPlugin"
- nonNLSMarkers="true" testSuiteClass="org.eclipse.emf.compare.uml2diff.tests.UML2DiffAllTests"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
- colorProviders="true" fontProviders="true" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.compare/model/compare.genmodel#//compare platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">
- <foreignModel>uml2diff.ecore</foreignModel>
- <genPackages xsi:type="genmodel:GenPackage" prefix="UMLCompare" basePackage="org.eclipse.emf.compare"
- disposableProviderFactory="true" ecorePackage="uml2diff.ecore#/">
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//AssociationChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//DependencyChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//InterfaceRealizationChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//SubstitutionChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//ExtendChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//IncludeChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//GeneralizationSetChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//ExecutionSpecificationChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//IntervalConstraintChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//MessageChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//StereotypePropertyChange">
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//StereotypePropertyChange/stereotype"/>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//StereotypeApplicationChange">
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//StereotypeApplicationChange/stereotype"/>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//StereotypeReferenceChange"/>
- <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//ProfileApplicationChange">
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//ProfileApplicationChange/profile"/>
- </genClasses>
- <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="uml2diff.ecore#//UMLDiff">
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//UMLDiff/discriminant"/>
- <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
- propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//UMLDiff/eReference"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?> +<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" + copyrightText="Copyright (c) 2012 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
 Obeo - initial API and implementation" + modelDirectory="/org.eclipse.emf.compare.uml2/src-gen" editDirectory="/org.eclipse.emf.compare.uml2.edit/src-gen" + modelPluginID="org.eclipse.emf.compare.uml2" modelName="Uml2" editPluginClass="org.eclipse.emf.compare.uml2.internal.provider.UMLCompareEditPlugin" + nonNLSMarkers="true" testSuiteClass="org.eclipse.emf.compare.uml2diff.tests.UML2DiffAllTests" + importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false" + colorProviders="true" fontProviders="true" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.compare/model/compare.genmodel#//compare platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types"> + <foreignModel>uml2compare.ecore</foreignModel> + <genPackages xsi:type="genmodel:GenPackage" prefix="UMLCompare" basePackage="org.eclipse.emf.compare" + disposableProviderFactory="true" interfacePackageSuffix="internal" metaDataPackageSuffix="internal" + classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" + presentationPackageSuffix="internal.presentation" testsPackageSuffix="internal.tests" + ecorePackage="uml2compare.ecore#/"> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//AssociationChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//DependencyChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//InterfaceRealizationChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//SubstitutionChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ExtendChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//IncludeChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//GeneralizationSetChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ExecutionSpecificationChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//IntervalConstraintChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//MessageChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypePropertyChange"> + <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" + propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//StereotypePropertyChange/stereotype"/> + </genClasses> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypeApplicationChange"> + <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" + propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//StereotypeApplicationChange/stereotype"/> + </genClasses> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypeReferenceChange"/> + <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ProfileApplicationChange"> + <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" + propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//ProfileApplicationChange/profile"/> + </genClasses> + <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="uml2compare.ecore#//UMLDiff"> + <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" + propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//UMLDiff/discriminant"/> + <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false" + propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//UMLDiff/eReference"/> + </genClasses> + </genPackages> +</genmodel:GenModel> diff --git a/plugins/org.eclipse.emf.compare.uml2/plugin.xml b/plugins/org.eclipse.emf.compare.uml2/plugin.xml index ab6632800..84a9a8ea5 100644 --- a/plugins/org.eclipse.emf.compare.uml2/plugin.xml +++ b/plugins/org.eclipse.emf.compare.uml2/plugin.xml @@ -17,13 +17,13 @@ Contributors: <extension point="org.eclipse.emf.ecore.generated_package"> <package uri="http://www.eclipse.org/emf/compare/uml2/2.0" - class="org.eclipse.emf.compare.uml2.UMLComparePackage" + class="org.eclipse.emf.compare.uml2.internal.UMLComparePackage" genModel="model/uml2diff.genmodel"/> </extension> <extension point="org.eclipse.emf.compare.rcp.postProcessor"> <processor - class="org.eclipse.emf.compare.uml2.diff.UMLDiffExtensionPostProcessor"> + class="org.eclipse.emf.compare.uml2.internal.postprocessor.UMLPostProcessor"> <nsURI value="http://www.eclipse.org/uml2/\d.0.0/UML"> </nsURI> @@ -32,7 +32,7 @@ Contributors: <extension point="org.eclipse.emf.compare.rcp.merger"> <merger - class="org.eclipse.emf.compare.uml2.merge.UMLDiffMerger" + class="org.eclipse.emf.compare.uml2.internal.merge.UMLMerger" ranking="20"> </merger> </extension> diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/AssociationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/AssociationChange.java index dac4f02db..94a29a346 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/AssociationChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/AssociationChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,10 +17,9 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getAssociationChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getAssociationChange()
* @model
* @generated
*/
public interface AssociationChange extends UMLDiff {
-
-} // AssociationChangeSpec
+} // AssociationChange
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/DependencyChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DependencyChange.java index 2b71d2846..7711f2f08 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/DependencyChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DependencyChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,10 +17,9 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getDependencyChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getDependencyChange()
* @model
* @generated
*/
public interface DependencyChange extends UMLDiff {
-
} // DependencyChange
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ExecutionSpecificationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExecutionSpecificationChange.java index 5c1e3a357..cb2de5e84 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ExecutionSpecificationChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExecutionSpecificationChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,7 +17,7 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getExecutionSpecificationChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getExecutionSpecificationChange()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ExtendChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExtendChange.java index a8ebabf53..aa3bef348 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ExtendChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExtendChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,10 +17,9 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getExtendChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getExtendChange()
* @model
* @generated
*/
public interface ExtendChange extends UMLDiff {
-
} // ExtendChange
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/GeneralizationSetChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/GeneralizationSetChange.java index 6b8f6e8c9..2013ea084 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/GeneralizationSetChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/GeneralizationSetChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,10 +17,9 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getGeneralizationSetChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getGeneralizationSetChange()
* @model
* @generated
*/
public interface GeneralizationSetChange extends UMLDiff {
-
} // GeneralizationSetChange
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/IncludeChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IncludeChange.java index 77bb437a4..298751486 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/IncludeChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IncludeChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,7 +17,7 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getIncludeChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getIncludeChange()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/InterfaceRealizationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/InterfaceRealizationChange.java index b19a98206..6e5dd4996 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/InterfaceRealizationChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/InterfaceRealizationChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,7 +17,7 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getInterfaceRealizationChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getInterfaceRealizationChange()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/IntervalConstraintChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IntervalConstraintChange.java index 0be7cc1fa..b4dab972e 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/IntervalConstraintChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IntervalConstraintChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,7 +17,7 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getIntervalConstraintChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getIntervalConstraintChange()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/MessageChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/MessageChange.java index 81f99d897..84d8c724a 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/MessageChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/MessageChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,7 +17,7 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getMessageChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getMessageChange()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ProfileApplicationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ProfileApplicationChange.java index 400e42cc0..d90250259 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ProfileApplicationChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ProfileApplicationChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
import org.eclipse.uml2.uml.Profile;
@@ -20,11 +20,11 @@ import org.eclipse.uml2.uml.Profile; * <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.ProfileApplicationChange#getProfile <em>Profile</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile <em>Profile</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getProfileApplicationChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getProfileApplicationChange()
* @model
* @generated
*/
@@ -39,14 +39,14 @@ public interface ProfileApplicationChange extends UMLDiff { * <!-- end-user-doc -->
* @return the value of the '<em>Profile</em>' reference.
* @see #setProfile(Profile)
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getProfileApplicationChange_Profile()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getProfileApplicationChange_Profile()
* @model
* @generated
*/
Profile getProfile();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.uml2.ProfileApplicationChange#getProfile <em>Profile</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile <em>Profile</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Profile</em>' reference.
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypeApplicationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeApplicationChange.java index db046aad3..582c8f7b1 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypeApplicationChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeApplicationChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
import org.eclipse.uml2.uml.Stereotype;
@@ -20,11 +20,11 @@ import org.eclipse.uml2.uml.Stereotype; * <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.StereotypeApplicationChange#getStereotype <em>Stereotype</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange#getStereotype <em>Stereotype</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getStereotypeApplicationChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypeApplicationChange()
* @model
* @generated
*/
@@ -39,14 +39,14 @@ public interface StereotypeApplicationChange extends UMLDiff { * <!-- end-user-doc -->
* @return the value of the '<em>Stereotype</em>' reference.
* @see #setStereotype(Stereotype)
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getStereotypeApplicationChange_Stereotype()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypeApplicationChange_Stereotype()
* @model
* @generated
*/
Stereotype getStereotype();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.uml2.StereotypeApplicationChange#getStereotype <em>Stereotype</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange#getStereotype <em>Stereotype</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Stereotype</em>' reference.
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypePropertyChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypePropertyChange.java index 59e72c24a..21a4a1549 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypePropertyChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypePropertyChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
import org.eclipse.uml2.uml.Stereotype;
@@ -20,11 +20,11 @@ import org.eclipse.uml2.uml.Stereotype; * <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.StereotypePropertyChange#getStereotype <em>Stereotype</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange#getStereotype <em>Stereotype</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getStereotypePropertyChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypePropertyChange()
* @model
* @generated
*/
@@ -39,14 +39,14 @@ public interface StereotypePropertyChange extends UMLDiff { * <!-- end-user-doc -->
* @return the value of the '<em>Stereotype</em>' reference.
* @see #setStereotype(Stereotype)
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getStereotypePropertyChange_Stereotype()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypePropertyChange_Stereotype()
* @model
* @generated
*/
Stereotype getStereotype();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.uml2.StereotypePropertyChange#getStereotype <em>Stereotype</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange#getStereotype <em>Stereotype</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Stereotype</em>' reference.
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypeReferenceChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeReferenceChange.java index e6be68910..3b8ef1850 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypeReferenceChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeReferenceChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,7 +17,7 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getStereotypeReferenceChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypeReferenceChange()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/SubstitutionChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/SubstitutionChange.java index 8ca64976d..f42f6a68c 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/SubstitutionChange.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/SubstitutionChange.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
/**
@@ -17,7 +17,7 @@ package org.eclipse.emf.compare.uml2; * <!-- end-user-doc -->
*
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getSubstitutionChange()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getSubstitutionChange()
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLCompareFactory.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java index 15ed02f0f..2863bbe4d 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLCompareFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
import org.eclipse.emf.ecore.EFactory;
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EFactory; * The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage
* @generated
*/
public interface UMLCompareFactory extends EFactory {
@@ -27,7 +27,7 @@ public interface UMLCompareFactory extends EFactory { * <!-- end-user-doc -->
* @generated
*/
- UMLCompareFactory eINSTANCE = org.eclipse.emf.compare.uml2.impl.UMLCompareFactoryImpl.init();
+ UMLCompareFactory eINSTANCE = org.eclipse.emf.compare.uml2.internal.impl.UMLCompareFactoryImpl.init();
/**
* Returns a new object of class '<em>Association Change</em>'.
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLComparePackage.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java index 2aba6c114..00f981506 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLComparePackage.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java @@ -8,69 +8,76 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
import org.eclipse.emf.compare.ComparePackage;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to
- * represent
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
* <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.UMLCompareFactory
+ * @see org.eclipse.emf.compare.uml2.internal.UMLCompareFactory
* @model kind="package"
* @generated
*/
public interface UMLComparePackage extends EPackage {
/**
* The package name.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
String eNAME = "uml2"; //$NON-NLS-1$
/**
* The package namespace URI.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
String eNS_URI = "http://www.eclipse.org/emf/compare/uml2/2.0"; //$NON-NLS-1$
/**
* The package namespace name.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
String eNS_PREFIX = "umlcompare"; //$NON-NLS-1$
/**
* The singleton instance of the package.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
- UMLComparePackage eINSTANCE = org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl.init();
+ UMLComparePackage eINSTANCE = org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.UMLDiffImpl <em>UML Diff</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.UMLDiffImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getUMLDiff()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl <em>UML Diff</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getUMLDiff()
* @generated
*/
int UML_DIFF = 14;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -78,8 +85,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -87,8 +94,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -96,8 +103,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -105,8 +112,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -114,16 +121,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int UML_DIFF__KIND = ComparePackage.DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -131,7 +139,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -139,17 +148,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int UML_DIFF__EQUIVALENCE = ComparePackage.DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -157,8 +166,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -166,8 +175,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -175,26 +184,27 @@ public interface UMLComparePackage extends EPackage { /**
* The number of structural features of the '<em>UML Diff</em>' class.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int UML_DIFF_FEATURE_COUNT = ComparePackage.DIFF_FEATURE_COUNT + 2;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.AssociationChangeImpl <em>Association Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.AssociationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getAssociationChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl <em>Association Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getAssociationChange()
* @generated
*/
int ASSOCIATION_CHANGE = 0;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -202,8 +212,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -211,8 +221,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -220,8 +230,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -229,8 +239,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -238,16 +248,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -255,7 +266,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -263,17 +275,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -281,8 +293,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -290,8 +302,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -307,18 +319,19 @@ public interface UMLComparePackage extends EPackage { int ASSOCIATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.DependencyChangeImpl <em>Dependency Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.DependencyChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getDependencyChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DependencyChangeImpl <em>Dependency Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.DependencyChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDependencyChange()
* @generated
*/
int DEPENDENCY_CHANGE = 1;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -326,8 +339,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -335,8 +348,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -344,8 +357,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -353,8 +366,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -362,16 +375,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int DEPENDENCY_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -379,7 +393,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -387,17 +402,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int DEPENDENCY_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -405,8 +420,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -414,8 +429,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -431,18 +446,19 @@ public interface UMLComparePackage extends EPackage { int DEPENDENCY_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.InterfaceRealizationChangeImpl <em>Interface Realization Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.InterfaceRealizationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getInterfaceRealizationChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.InterfaceRealizationChangeImpl <em>Interface Realization Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.InterfaceRealizationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getInterfaceRealizationChange()
* @generated
*/
int INTERFACE_REALIZATION_CHANGE = 2;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -450,8 +466,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -459,8 +475,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -468,8 +484,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -477,8 +493,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -486,16 +502,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERFACE_REALIZATION_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -503,7 +520,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -511,17 +529,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERFACE_REALIZATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -529,8 +547,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -538,35 +556,36 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERFACE_REALIZATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The number of structural features of the '<em>Interface Realization Change</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Interface Realization Change</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERFACE_REALIZATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.SubstitutionChangeImpl <em>Substitution Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.SubstitutionChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getSubstitutionChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.SubstitutionChangeImpl <em>Substitution Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.SubstitutionChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getSubstitutionChange()
* @generated
*/
int SUBSTITUTION_CHANGE = 3;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -574,8 +593,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -583,8 +602,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -592,8 +611,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -601,8 +620,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -610,16 +629,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int SUBSTITUTION_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -627,7 +647,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -635,17 +656,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int SUBSTITUTION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -653,8 +674,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -662,8 +683,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -679,18 +700,19 @@ public interface UMLComparePackage extends EPackage { int SUBSTITUTION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.ExtendChangeImpl <em>Extend Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.ExtendChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getExtendChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl <em>Extend Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getExtendChange()
* @generated
*/
int EXTEND_CHANGE = 4;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -698,8 +720,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -707,8 +729,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -716,8 +738,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -725,8 +747,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -734,16 +756,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXTEND_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -751,7 +774,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -759,17 +783,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXTEND_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -777,8 +801,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -786,8 +810,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -795,26 +819,27 @@ public interface UMLComparePackage extends EPackage { /**
* The number of structural features of the '<em>Extend Change</em>' class.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXTEND_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.IncludeChangeImpl <em>Include Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.IncludeChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getIncludeChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.IncludeChangeImpl <em>Include Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.IncludeChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getIncludeChange()
* @generated
*/
int INCLUDE_CHANGE = 5;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -822,8 +847,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -831,8 +856,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -840,8 +865,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -849,8 +874,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -858,16 +883,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INCLUDE_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -875,7 +901,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -883,17 +910,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INCLUDE_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -901,8 +928,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -910,8 +937,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -919,26 +946,27 @@ public interface UMLComparePackage extends EPackage { /**
* The number of structural features of the '<em>Include Change</em>' class.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INCLUDE_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.GeneralizationSetChangeImpl <em>Generalization Set Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.GeneralizationSetChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getGeneralizationSetChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.GeneralizationSetChangeImpl <em>Generalization Set Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.GeneralizationSetChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getGeneralizationSetChange()
* @generated
*/
int GENERALIZATION_SET_CHANGE = 6;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -946,8 +974,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -955,8 +983,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -964,8 +992,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -973,8 +1001,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -982,16 +1010,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -999,7 +1028,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1007,17 +1037,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1025,8 +1055,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1034,35 +1064,36 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The number of structural features of the '<em>Generalization Set Change</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Generalization Set Change</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.ExecutionSpecificationChangeImpl <em>Execution Specification Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.ExecutionSpecificationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getExecutionSpecificationChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExecutionSpecificationChangeImpl <em>Execution Specification Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.ExecutionSpecificationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getExecutionSpecificationChange()
* @generated
*/
int EXECUTION_SPECIFICATION_CHANGE = 7;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1070,8 +1101,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1079,8 +1110,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1088,8 +1119,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1097,8 +1128,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1106,16 +1137,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1123,7 +1155,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1131,17 +1164,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1149,8 +1182,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1158,35 +1191,36 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The number of structural features of the '<em>Execution Specification Change</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Execution Specification Change</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.IntervalConstraintChangeImpl <em>Interval Constraint Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.IntervalConstraintChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getIntervalConstraintChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.IntervalConstraintChangeImpl <em>Interval Constraint Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.IntervalConstraintChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getIntervalConstraintChange()
* @generated
*/
int INTERVAL_CONSTRAINT_CHANGE = 8;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1194,8 +1228,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1203,8 +1237,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1212,8 +1246,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1221,8 +1255,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1230,16 +1264,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1247,7 +1282,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1255,17 +1291,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1273,8 +1309,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1282,35 +1318,36 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The number of structural features of the '<em>Interval Constraint Change</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Interval Constraint Change</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.MessageChangeImpl <em>Message Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.MessageChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getMessageChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.MessageChangeImpl <em>Message Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.MessageChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getMessageChange()
* @generated
*/
int MESSAGE_CHANGE = 9;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1318,8 +1355,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1327,8 +1364,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1336,8 +1373,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1345,8 +1382,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1354,16 +1391,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int MESSAGE_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1371,7 +1409,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1379,17 +1418,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int MESSAGE_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1397,8 +1436,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1406,8 +1445,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1415,26 +1454,27 @@ public interface UMLComparePackage extends EPackage { /**
* The number of structural features of the '<em>Message Change</em>' class.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int MESSAGE_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.StereotypePropertyChangeImpl <em>Stereotype Property Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.StereotypePropertyChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getStereotypePropertyChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypePropertyChangeImpl <em>Stereotype Property Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.StereotypePropertyChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypePropertyChange()
* @generated
*/
int STEREOTYPE_PROPERTY_CHANGE = 10;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1442,8 +1482,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1451,8 +1491,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1460,8 +1500,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1469,8 +1509,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1478,16 +1518,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_PROPERTY_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1495,7 +1536,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1503,17 +1545,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_PROPERTY_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1521,8 +1563,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1530,8 +1572,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1539,35 +1581,36 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Stereotype</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_PROPERTY_CHANGE__STEREOTYPE = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The number of structural features of the '<em>Stereotype Property Change</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Stereotype Property Change</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_PROPERTY_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.StereotypeApplicationChangeImpl <em>Stereotype Application Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.StereotypeApplicationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getStereotypeApplicationChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeApplicationChangeImpl <em>Stereotype Application Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.StereotypeApplicationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypeApplicationChange()
* @generated
*/
int STEREOTYPE_APPLICATION_CHANGE = 11;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1575,8 +1618,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1584,8 +1627,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1593,8 +1636,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1602,8 +1645,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1611,16 +1654,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1628,7 +1672,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1636,17 +1681,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1654,8 +1699,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1663,8 +1708,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1672,35 +1717,36 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Stereotype</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The number of structural features of the '<em>Stereotype Application Change</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Stereotype Application Change</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.StereotypeReferenceChangeImpl <em>Stereotype Reference Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.StereotypeReferenceChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getStereotypeReferenceChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeReferenceChangeImpl <em>Stereotype Reference Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.StereotypeReferenceChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypeReferenceChange()
* @generated
*/
int STEREOTYPE_REFERENCE_CHANGE = 12;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1708,8 +1754,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1717,8 +1763,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1726,8 +1772,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1735,8 +1781,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1744,16 +1790,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1761,7 +1808,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1769,17 +1817,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1787,8 +1835,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1796,35 +1844,36 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The number of structural features of the '<em>Stereotype Reference Change</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Stereotype Reference Change</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.emf.compare.uml2.impl.ProfileApplicationChangeImpl <em>Profile Application Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.ProfileApplicationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getProfileApplicationChange()
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ProfileApplicationChangeImpl <em>Profile Application Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.ProfileApplicationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getProfileApplicationChange()
* @generated
*/
int PROFILE_APPLICATION_CHANGE = 13;
/**
* The feature id for the '<em><b>Match</b></em>' container reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1832,8 +1881,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Requires</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1841,8 +1890,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Required By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1850,8 +1899,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refines</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1859,8 +1908,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Refined By</b></em>' reference list.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1868,16 +1917,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Kind</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__KIND = UML_DIFF__KIND;
/**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1885,7 +1935,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>State</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1893,17 +1944,17 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Equivalence</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;
/**
- * The feature id for the '<em><b>Conflict</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1911,8 +1962,8 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>Discriminant</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1920,416 +1971,449 @@ public interface UMLComparePackage extends EPackage { /**
* The feature id for the '<em><b>EReference</b></em>' reference.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The feature id for the '<em><b>Profile</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * The feature id for the '<em><b>Profile</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__PROFILE = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The number of structural features of the '<em>Profile Application Change</em>' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The number of structural features of the '<em>Profile Application Change</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 1;
+
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.AssociationChange <em>Association Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.AssociationChange <em>Association Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Association Change</em>'.
- * @see org.eclipse.emf.compare.uml2.AssociationChange
+ * @see org.eclipse.emf.compare.uml2.internal.AssociationChange
* @generated
*/
EClass getAssociationChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.DependencyChange <em>Dependency Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.DependencyChange <em>Dependency Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Dependency Change</em>'.
- * @see org.eclipse.emf.compare.uml2.DependencyChange
+ * @see org.eclipse.emf.compare.uml2.internal.DependencyChange
* @generated
*/
EClass getDependencyChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.InterfaceRealizationChange <em>Interface Realization Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange <em>Interface Realization Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Interface Realization Change</em>'.
- * @see org.eclipse.emf.compare.uml2.InterfaceRealizationChange
+ * @see org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange
* @generated
*/
EClass getInterfaceRealizationChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.SubstitutionChange <em>Substitution Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange <em>Substitution Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Substitution Change</em>'.
- * @see org.eclipse.emf.compare.uml2.SubstitutionChange
+ * @see org.eclipse.emf.compare.uml2.internal.SubstitutionChange
* @generated
*/
EClass getSubstitutionChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.ExtendChange <em>Extend Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.ExtendChange <em>Extend Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Extend Change</em>'.
- * @see org.eclipse.emf.compare.uml2.ExtendChange
+ * @see org.eclipse.emf.compare.uml2.internal.ExtendChange
* @generated
*/
EClass getExtendChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.IncludeChange <em>Include Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.IncludeChange <em>Include Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Include Change</em>'.
- * @see org.eclipse.emf.compare.uml2.IncludeChange
+ * @see org.eclipse.emf.compare.uml2.internal.IncludeChange
* @generated
*/
EClass getIncludeChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.GeneralizationSetChange <em>Generalization Set Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange <em>Generalization Set Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Generalization Set Change</em>'.
- * @see org.eclipse.emf.compare.uml2.GeneralizationSetChange
+ * @see org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange
* @generated
*/
EClass getGeneralizationSetChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.ExecutionSpecificationChange <em>Execution Specification Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange <em>Execution Specification Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Execution Specification Change</em>'.
- * @see org.eclipse.emf.compare.uml2.ExecutionSpecificationChange
+ * @see org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange
* @generated
*/
EClass getExecutionSpecificationChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.IntervalConstraintChange <em>Interval Constraint Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange <em>Interval Constraint Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Interval Constraint Change</em>'.
- * @see org.eclipse.emf.compare.uml2.IntervalConstraintChange
+ * @see org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange
* @generated
*/
EClass getIntervalConstraintChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.MessageChange <em>Message Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.MessageChange <em>Message Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Message Change</em>'.
- * @see org.eclipse.emf.compare.uml2.MessageChange
+ * @see org.eclipse.emf.compare.uml2.internal.MessageChange
* @generated
*/
EClass getMessageChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.StereotypePropertyChange <em>Stereotype Property Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange <em>Stereotype Property Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Stereotype Property Change</em>'.
- * @see org.eclipse.emf.compare.uml2.StereotypePropertyChange
+ * @see org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange
* @generated
*/
EClass getStereotypePropertyChange();
/**
- * Returns the meta object for the reference '
- * {@link org.eclipse.emf.compare.uml2.StereotypePropertyChange#getStereotype <em>Stereotype</em>}'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange#getStereotype <em>Stereotype</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for the reference '<em>Stereotype</em>'.
- * @see org.eclipse.emf.compare.uml2.StereotypePropertyChange#getStereotype()
+ * @see org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange#getStereotype()
* @see #getStereotypePropertyChange()
* @generated
*/
EReference getStereotypePropertyChange_Stereotype();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.StereotypeApplicationChange <em>Stereotype Application Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange <em>Stereotype Application Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Stereotype Application Change</em>'.
- * @see org.eclipse.emf.compare.uml2.StereotypeApplicationChange
+ * @see org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange
* @generated
*/
EClass getStereotypeApplicationChange();
/**
- * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.StereotypeApplicationChange#getStereotype <em>Stereotype</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange#getStereotype <em>Stereotype</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for the reference '<em>Stereotype</em>'.
- * @see org.eclipse.emf.compare.uml2.StereotypeApplicationChange#getStereotype()
+ * @see org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange#getStereotype()
* @see #getStereotypeApplicationChange()
* @generated
*/
EReference getStereotypeApplicationChange_Stereotype();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.StereotypeReferenceChange <em>Stereotype Reference Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange <em>Stereotype Reference Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Stereotype Reference Change</em>'.
- * @see org.eclipse.emf.compare.uml2.StereotypeReferenceChange
+ * @see org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange
* @generated
*/
EClass getStereotypeReferenceChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.ProfileApplicationChange <em>Profile Application Change</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange <em>Profile Application Change</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>Profile Application Change</em>'.
- * @see org.eclipse.emf.compare.uml2.ProfileApplicationChange
+ * @see org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange
* @generated
*/
EClass getProfileApplicationChange();
/**
- * Returns the meta object for the reference '
- * {@link org.eclipse.emf.compare.uml2.ProfileApplicationChange#getProfile <em>Profile</em>}'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile <em>Profile</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for the reference '<em>Profile</em>'.
- * @see org.eclipse.emf.compare.uml2.ProfileApplicationChange#getProfile()
+ * @see org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile()
* @see #getProfileApplicationChange()
* @generated
*/
EReference getProfileApplicationChange_Profile();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.UMLDiff <em>UML Diff</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff <em>UML Diff</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for class '<em>UML Diff</em>'.
- * @see org.eclipse.emf.compare.uml2.UMLDiff
+ * @see org.eclipse.emf.compare.uml2.internal.UMLDiff
* @generated
*/
EClass getUMLDiff();
/**
- * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.UMLDiff#getDiscriminant <em>Discriminant</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getDiscriminant <em>Discriminant</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for the reference '<em>Discriminant</em>'.
- * @see org.eclipse.emf.compare.uml2.UMLDiff#getDiscriminant()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLDiff#getDiscriminant()
* @see #getUMLDiff()
* @generated
*/
EReference getUMLDiff_Discriminant();
/**
- * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.UMLDiff#getEReference <em>EReference</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getEReference <em>EReference</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the meta object for the reference '<em>EReference</em>'.
- * @see org.eclipse.emf.compare.uml2.UMLDiff#getEReference()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLDiff#getEReference()
* @see #getUMLDiff()
* @generated
*/
EReference getUMLDiff_EReference();
/**
- * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
+ * Returns the factory that creates the instances of the model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @return the factory that creates the instances of the model.
* @generated
*/
UMLCompareFactory getUMLCompareFactory();
/**
- * <!-- begin-user-doc --> Defines literals for the meta objects that represent
+ * <!-- begin-user-doc -->
+ * Defines literals for the meta objects that represent
* <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
* @generated
*/
interface Literals {
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.AssociationChangeImpl <em>Association Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.AssociationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getAssociationChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl <em>Association Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getAssociationChange()
* @generated
*/
EClass ASSOCIATION_CHANGE = eINSTANCE.getAssociationChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.DependencyChangeImpl <em>Dependency Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.DependencyChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getDependencyChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DependencyChangeImpl <em>Dependency Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.DependencyChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDependencyChange()
* @generated
*/
EClass DEPENDENCY_CHANGE = eINSTANCE.getDependencyChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.InterfaceRealizationChangeImpl <em>Interface Realization Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.InterfaceRealizationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getInterfaceRealizationChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.InterfaceRealizationChangeImpl <em>Interface Realization Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.InterfaceRealizationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getInterfaceRealizationChange()
* @generated
*/
EClass INTERFACE_REALIZATION_CHANGE = eINSTANCE.getInterfaceRealizationChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.SubstitutionChangeImpl <em>Substitution Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.SubstitutionChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getSubstitutionChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.SubstitutionChangeImpl <em>Substitution Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.SubstitutionChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getSubstitutionChange()
* @generated
*/
EClass SUBSTITUTION_CHANGE = eINSTANCE.getSubstitutionChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.ExtendChangeImpl <em>Extend Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.ExtendChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getExtendChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl <em>Extend Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getExtendChange()
* @generated
*/
EClass EXTEND_CHANGE = eINSTANCE.getExtendChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.IncludeChangeImpl <em>Include Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.IncludeChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getIncludeChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.IncludeChangeImpl <em>Include Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.IncludeChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getIncludeChange()
* @generated
*/
EClass INCLUDE_CHANGE = eINSTANCE.getIncludeChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.GeneralizationSetChangeImpl <em>Generalization Set Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.GeneralizationSetChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getGeneralizationSetChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.GeneralizationSetChangeImpl <em>Generalization Set Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.GeneralizationSetChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getGeneralizationSetChange()
* @generated
*/
EClass GENERALIZATION_SET_CHANGE = eINSTANCE.getGeneralizationSetChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.ExecutionSpecificationChangeImpl <em>Execution Specification Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.ExecutionSpecificationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getExecutionSpecificationChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExecutionSpecificationChangeImpl <em>Execution Specification Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.ExecutionSpecificationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getExecutionSpecificationChange()
* @generated
*/
EClass EXECUTION_SPECIFICATION_CHANGE = eINSTANCE.getExecutionSpecificationChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.IntervalConstraintChangeImpl <em>Interval Constraint Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.IntervalConstraintChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getIntervalConstraintChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.IntervalConstraintChangeImpl <em>Interval Constraint Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.IntervalConstraintChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getIntervalConstraintChange()
* @generated
*/
EClass INTERVAL_CONSTRAINT_CHANGE = eINSTANCE.getIntervalConstraintChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.MessageChangeImpl <em>Message Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.MessageChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getMessageChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.MessageChangeImpl <em>Message Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.MessageChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getMessageChange()
* @generated
*/
EClass MESSAGE_CHANGE = eINSTANCE.getMessageChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.StereotypePropertyChangeImpl <em>Stereotype Property Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.StereotypePropertyChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getStereotypePropertyChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypePropertyChangeImpl <em>Stereotype Property Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.StereotypePropertyChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypePropertyChange()
* @generated
*/
EClass STEREOTYPE_PROPERTY_CHANGE = eINSTANCE.getStereotypePropertyChange();
/**
* The meta object literal for the '<em><b>Stereotype</b></em>' reference feature.
- * <!-- begin-user-doc
- * --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
EReference STEREOTYPE_PROPERTY_CHANGE__STEREOTYPE = eINSTANCE.getStereotypePropertyChange_Stereotype();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.StereotypeApplicationChangeImpl <em>Stereotype Application Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.StereotypeApplicationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getStereotypeApplicationChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeApplicationChangeImpl <em>Stereotype Application Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.StereotypeApplicationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypeApplicationChange()
* @generated
*/
EClass STEREOTYPE_APPLICATION_CHANGE = eINSTANCE.getStereotypeApplicationChange();
/**
* The meta object literal for the '<em><b>Stereotype</b></em>' reference feature.
- * <!-- begin-user-doc
- * --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
EReference STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE = eINSTANCE.getStereotypeApplicationChange_Stereotype();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.StereotypeReferenceChangeImpl <em>Stereotype Reference Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.StereotypeReferenceChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getStereotypeReferenceChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeReferenceChangeImpl <em>Stereotype Reference Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.StereotypeReferenceChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypeReferenceChange()
* @generated
*/
EClass STEREOTYPE_REFERENCE_CHANGE = eINSTANCE.getStereotypeReferenceChange();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.ProfileApplicationChangeImpl <em>Profile Application Change</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.ProfileApplicationChangeImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getProfileApplicationChange()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ProfileApplicationChangeImpl <em>Profile Application Change</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.ProfileApplicationChangeImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getProfileApplicationChange()
* @generated
*/
EClass PROFILE_APPLICATION_CHANGE = eINSTANCE.getProfileApplicationChange();
/**
* The meta object literal for the '<em><b>Profile</b></em>' reference feature.
- * <!-- begin-user-doc
- * --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
EReference PROFILE_APPLICATION_CHANGE__PROFILE = eINSTANCE.getProfileApplicationChange_Profile();
/**
- * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.impl.UMLDiffImpl <em>UML Diff</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.impl.UMLDiffImpl
- * @see org.eclipse.emf.compare.uml2.impl.UMLComparePackageImpl#getUMLDiff()
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl <em>UML Diff</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getUMLDiff()
* @generated
*/
EClass UML_DIFF = eINSTANCE.getUMLDiff();
/**
- * The meta object literal for the '<em><b>Discriminant</b></em>' reference feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '<em><b>Discriminant</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
EReference UML_DIFF__DISCRIMINANT = eINSTANCE.getUMLDiff_Discriminant();
/**
* The meta object literal for the '<em><b>EReference</b></em>' reference feature.
- * <!-- begin-user-doc
- * --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
EReference UML_DIFF__EREFERENCE = eINSTANCE.getUMLDiff_EReference();
}
-} // UMLComparePackage
+} //UMLComparePackage
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLDiff.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLDiff.java index 2ec6067d9..5fbc8fb3b 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLDiff.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLDiff.java @@ -8,9 +8,10 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2;
+package org.eclipse.emf.compare.uml2.internal;
import org.eclipse.emf.compare.Diff;
+
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
@@ -22,12 +23,12 @@ import org.eclipse.emf.ecore.EReference; * <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.UMLDiff#getDiscriminant <em>Discriminant</em>}</li>
- * <li>{@link org.eclipse.emf.compare.uml2.UMLDiff#getEReference <em>EReference</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getDiscriminant <em>Discriminant</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getEReference <em>EReference</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getUMLDiff()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getUMLDiff()
* @model abstract="true"
* @generated
*/
@@ -42,14 +43,14 @@ public interface UMLDiff extends Diff { * <!-- end-user-doc -->
* @return the value of the '<em>Discriminant</em>' reference.
* @see #setDiscriminant(EObject)
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getUMLDiff_Discriminant()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getUMLDiff_Discriminant()
* @model
* @generated
*/
EObject getDiscriminant();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.uml2.UMLDiff#getDiscriminant <em>Discriminant</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getDiscriminant <em>Discriminant</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Discriminant</em>' reference.
@@ -68,14 +69,14 @@ public interface UMLDiff extends Diff { * <!-- end-user-doc -->
* @return the value of the '<em>EReference</em>' reference.
* @see #setEReference(EReference)
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#getUMLDiff_EReference()
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getUMLDiff_EReference()
* @model
* @generated
*/
EReference getEReference();
/**
- * Sets the value of the '{@link org.eclipse.emf.compare.uml2.UMLDiff#getEReference <em>EReference</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getEReference <em>EReference</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>EReference</em>' reference.
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/AssociationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/AssociationChangeImpl.java index 75a31fe69..44cb589e9 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/AssociationChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/AssociationChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.AssociationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.AssociationChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/DependencyChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DependencyChangeImpl.java index 50749fe12..00053a776 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/DependencyChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DependencyChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.DependencyChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExecutionSpecificationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ExecutionSpecificationChangeImpl.java index 40f3c5c27..29123ac4a 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExecutionSpecificationChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ExecutionSpecificationChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExtendChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ExtendChangeImpl.java index a9bdc3d54..aace331e3 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExtendChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ExtendChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.ExtendChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.ExtendChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/GeneralizationSetChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/GeneralizationSetChangeImpl.java index baf11aef5..2000f7cb6 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/GeneralizationSetChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/GeneralizationSetChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.GeneralizationSetChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IncludeChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/IncludeChangeImpl.java index 50e4c79b7..fb6067f69 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IncludeChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/IncludeChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.IncludeChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.IncludeChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/InterfaceRealizationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/InterfaceRealizationChangeImpl.java index 4296600ff..a58375310 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/InterfaceRealizationChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/InterfaceRealizationChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IntervalConstraintChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/IntervalConstraintChangeImpl.java index 3756da125..0fc61f60b 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IntervalConstraintChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/IntervalConstraintChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.IntervalConstraintChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/MessageChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/MessageChangeImpl.java index 2f09c234f..77b6540d2 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/MessageChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/MessageChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.MessageChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.MessageChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ProfileApplicationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ProfileApplicationChangeImpl.java index 07162e502..70d6b25c7 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ProfileApplicationChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ProfileApplicationChangeImpl.java @@ -8,14 +8,18 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+
+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.uml2.uml.Profile;
/**
@@ -25,7 +29,7 @@ import org.eclipse.uml2.uml.Profile; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.impl.ProfileApplicationChangeImpl#getProfile <em>Profile</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.impl.ProfileApplicationChangeImpl#getProfile <em>Profile</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeApplicationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeApplicationChangeImpl.java index 315cc409d..13223898e 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeApplicationChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeApplicationChangeImpl.java @@ -8,14 +8,18 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.uml2.uml.Stereotype;
/**
@@ -25,7 +29,7 @@ import org.eclipse.uml2.uml.Stereotype; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.impl.StereotypeApplicationChangeImpl#getStereotype <em>Stereotype</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeApplicationChangeImpl#getStereotype <em>Stereotype</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypePropertyChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypePropertyChangeImpl.java index 954027f5c..147307d98 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypePropertyChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypePropertyChangeImpl.java @@ -8,14 +8,18 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.compare.uml2.StereotypePropertyChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
+
+import org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.uml2.uml.Stereotype;
/**
@@ -25,7 +29,7 @@ import org.eclipse.uml2.uml.Stereotype; * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.impl.StereotypePropertyChangeImpl#getStereotype <em>Stereotype</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypePropertyChangeImpl#getStereotype <em>Stereotype</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeReferenceChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeReferenceChangeImpl.java index c713f9841..bae756bcf 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeReferenceChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeReferenceChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/SubstitutionChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/SubstitutionChangeImpl.java index 912783c55..0c6b1d3d9 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/SubstitutionChangeImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/SubstitutionChangeImpl.java @@ -8,10 +8,11 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.SubstitutionChange;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLCompareFactoryImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java index b172e2714..3ff5742ce 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLCompareFactoryImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java @@ -8,28 +8,16 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.compare.uml2.internal.*;
-import org.eclipse.emf.compare.uml2.AssociationChange;
-import org.eclipse.emf.compare.uml2.DependencyChange;
-import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;
-import org.eclipse.emf.compare.uml2.ExtendChange;
-import org.eclipse.emf.compare.uml2.GeneralizationSetChange;
-import org.eclipse.emf.compare.uml2.IncludeChange;
-import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;
-import org.eclipse.emf.compare.uml2.IntervalConstraintChange;
-import org.eclipse.emf.compare.uml2.MessageChange;
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
-import org.eclipse.emf.compare.uml2.StereotypePropertyChange;
-import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;
-import org.eclipse.emf.compare.uml2.SubstitutionChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+
import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
import org.eclipse.emf.ecore.plugin.EcorePlugin;
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLComparePackageImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java index 83d61295a..7f4fcb5fa 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLComparePackageImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java @@ -8,124 +8,145 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
import org.eclipse.emf.compare.ComparePackage;
-import org.eclipse.emf.compare.uml2.AssociationChange;
-import org.eclipse.emf.compare.uml2.DependencyChange;
-import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;
-import org.eclipse.emf.compare.uml2.ExtendChange;
-import org.eclipse.emf.compare.uml2.GeneralizationSetChange;
-import org.eclipse.emf.compare.uml2.IncludeChange;
-import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;
-import org.eclipse.emf.compare.uml2.IntervalConstraintChange;
-import org.eclipse.emf.compare.uml2.MessageChange;
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
-import org.eclipse.emf.compare.uml2.StereotypePropertyChange;
-import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;
-import org.eclipse.emf.compare.uml2.SubstitutionChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+
+import org.eclipse.emf.compare.uml2.internal.AssociationChange;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
+import org.eclipse.emf.compare.uml2.internal.ExtendChange;
+import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;
+import org.eclipse.emf.compare.uml2.internal.IncludeChange;
+import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;
+import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;
+import org.eclipse.emf.compare.uml2.internal.MessageChange;
+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange;
+import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EcorePackage;
+
import org.eclipse.emf.ecore.impl.EPackageImpl;
+
import org.eclipse.uml2.uml.UMLPackage;
/**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
* @generated
*/
public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePackage {
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass associationChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass dependencyChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass interfaceRealizationChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass substitutionChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass extendChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass includeChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass generalizationSetChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass executionSpecificationChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass intervalConstraintChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass messageChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass stereotypePropertyChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass stereotypeApplicationChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass stereotypeReferenceChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass profileApplicationChangeEClass = null;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private EClass umlDiffEClass = null;
@@ -138,9 +159,10 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac * 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 -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage#eNS_URI
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#eNS_URI
* @see #init()
* @generated
*/
@@ -149,7 +171,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private static boolean isInited = false;
@@ -159,7 +182,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac *
* <p>This method is used to initialize {@link UMLComparePackage#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 -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -193,7 +217,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getAssociationChange() {
@@ -201,7 +226,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getDependencyChange() {
@@ -209,7 +235,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getInterfaceRealizationChange() {
@@ -217,7 +244,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getSubstitutionChange() {
@@ -225,7 +253,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getExtendChange() {
@@ -233,7 +262,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getIncludeChange() {
@@ -241,7 +271,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getGeneralizationSetChange() {
@@ -249,7 +280,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getExecutionSpecificationChange() {
@@ -257,7 +289,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getIntervalConstraintChange() {
@@ -265,7 +298,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getMessageChange() {
@@ -273,7 +307,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getStereotypePropertyChange() {
@@ -281,7 +316,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EReference getStereotypePropertyChange_Stereotype() {
@@ -289,7 +325,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getStereotypeApplicationChange() {
@@ -297,7 +334,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EReference getStereotypeApplicationChange_Stereotype() {
@@ -305,7 +343,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getStereotypeReferenceChange() {
@@ -313,7 +352,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getProfileApplicationChange() {
@@ -321,7 +361,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EReference getProfileApplicationChange_Profile() {
@@ -329,7 +370,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EClass getUMLDiff() {
@@ -337,7 +379,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EReference getUMLDiff_Discriminant() {
@@ -345,7 +388,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EReference getUMLDiff_EReference() {
@@ -353,7 +397,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public UMLCompareFactory getUMLCompareFactory() {
@@ -361,7 +406,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private boolean isCreated = false;
@@ -369,7 +415,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac /**
* 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 -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public void createPackageContents() {
@@ -414,7 +461,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
private boolean isInitialized = false;
@@ -422,7 +470,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac /**
* 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 -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public void initializePackageContents() {
@@ -500,4 +549,4 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac createResource(eNS_URI);
}
-} // UMLComparePackageImpl
+} //UMLComparePackageImpl
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLDiffImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLDiffImpl.java index 2a1b3d09a..1f8243069 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLDiffImpl.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLDiffImpl.java @@ -1,5 +1,5 @@ /**
- * Copyright (c) 2012, 2013 Obeo.
+ * Copyright (c) 2012 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
@@ -8,38 +8,41 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.impl;
+package org.eclipse.emf.compare.uml2.internal.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicMonitor;
+
import org.eclipse.emf.compare.impl.DiffImpl;
-import org.eclipse.emf.compare.merge.IMerger;
-import org.eclipse.emf.compare.uml2.UMLComparePackage;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>UML Diff</b></em>'. <!-- end-user-doc
- * -->
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UML Diff</b></em>'.
+ * <!-- end-user-doc -->
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.impl.UMLDiffImpl#getDiscriminant <em>Discriminant</em>}</li>
- * <li>{@link org.eclipse.emf.compare.uml2.impl.UMLDiffImpl#getEReference <em>EReference</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl#getDiscriminant <em>Discriminant</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl#getEReference <em>EReference</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff {
/**
- * The cached value of the '{@link #getDiscriminant() <em>Discriminant</em>}' reference. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
+ * The cached value of the '{@link #getDiscriminant() <em>Discriminant</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see #getDiscriminant()
* @generated
* @ordered
@@ -47,9 +50,9 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { protected EObject discriminant;
/**
- * The cached value of the '{@link #getEReference() <em>EReference</em>}' reference. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
+ * The cached value of the '{@link #getEReference() <em>EReference</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see #getEReference()
* @generated
* @ordered
@@ -57,8 +60,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { protected EReference eReference;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
protected UMLDiffImpl() {
@@ -66,8 +69,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@Override
@@ -76,8 +79,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EObject getDiscriminant() {
@@ -85,18 +88,16 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { InternalEObject oldDiscriminant = (InternalEObject)discriminant;
discriminant = eResolveProxy(oldDiscriminant);
if (discriminant != oldDiscriminant) {
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- UMLComparePackage.UML_DIFF__DISCRIMINANT, oldDiscriminant, discriminant));
- }
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLComparePackage.UML_DIFF__DISCRIMINANT, oldDiscriminant, discriminant));
}
}
return discriminant;
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EObject basicGetDiscriminant() {
@@ -104,22 +105,20 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public void setDiscriminant(EObject newDiscriminant) {
EObject oldDiscriminant = discriminant;
discriminant = newDiscriminant;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.UML_DIFF__DISCRIMINANT,
- oldDiscriminant, discriminant));
- }
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.UML_DIFF__DISCRIMINANT, oldDiscriminant, discriminant));
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EReference getEReference() {
@@ -127,18 +126,16 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { InternalEObject oldEReference = (InternalEObject)eReference;
eReference = (EReference)eResolveProxy(oldEReference);
if (eReference != oldEReference) {
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- UMLComparePackage.UML_DIFF__EREFERENCE, oldEReference, eReference));
- }
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLComparePackage.UML_DIFF__EREFERENCE, oldEReference, eReference));
}
}
return eReference;
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public EReference basicGetEReference() {
@@ -146,44 +143,38 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public void setEReference(EReference newEReference) {
EReference oldEReference = eReference;
eReference = newEReference;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.UML_DIFF__EREFERENCE,
- oldEReference, eReference));
- }
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.UML_DIFF__EREFERENCE, oldEReference, eReference));
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLComparePackage.UML_DIFF__DISCRIMINANT:
- if (resolve) {
- return getDiscriminant();
- }
+ if (resolve) return getDiscriminant();
return basicGetDiscriminant();
case UMLComparePackage.UML_DIFF__EREFERENCE:
- if (resolve) {
- return getEReference();
- }
+ if (resolve) return getEReference();
return basicGetEReference();
}
return super.eGet(featureID, resolve, coreType);
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@Override
@@ -200,8 +191,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@Override
@@ -218,8 +209,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { }
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@Override
@@ -233,17 +224,4 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff { return super.eIsSet(featureID);
}
- @Deprecated
- @Override
- public void copyLeftToRight() {
- final IMerger merger = IMerger.RegistryImpl.createStandaloneInstance().getHighestRankingMerger(this);
- merger.copyLeftToRight(this, new BasicMonitor());
- }
-
- @Deprecated
- @Override
- public void copyRightToLeft() {
- final IMerger merger = IMerger.RegistryImpl.createStandaloneInstance().getHighestRankingMerger(this);
- merger.copyRightToLeft(this, new BasicMonitor());
- }
-} // UMLDiffImpl
+} //UMLDiffImpl
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java index cd9db07e8..f2ef83c86 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareAdapterFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.util;
+package org.eclipse.emf.compare.uml2.internal.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.compare.Diff;
-import org.eclipse.emf.compare.uml2.*;
+import org.eclipse.emf.compare.uml2.internal.*;
import org.eclipse.emf.ecore.EObject;
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.EObject; * The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage
* @generated
*/
public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
@@ -162,13 +162,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.AssociationChange <em>Association Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.AssociationChange <em>Association Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.AssociationChange
+ * @see org.eclipse.emf.compare.uml2.internal.AssociationChange
* @generated
*/
public Adapter createAssociationChangeAdapter() {
@@ -176,13 +176,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.DependencyChange <em>Dependency Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.DependencyChange <em>Dependency Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.DependencyChange
+ * @see org.eclipse.emf.compare.uml2.internal.DependencyChange
* @generated
*/
public Adapter createDependencyChangeAdapter() {
@@ -190,13 +190,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.InterfaceRealizationChange <em>Interface Realization Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange <em>Interface Realization Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.InterfaceRealizationChange
+ * @see org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange
* @generated
*/
public Adapter createInterfaceRealizationChangeAdapter() {
@@ -204,13 +204,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.SubstitutionChange <em>Substitution Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange <em>Substitution Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.SubstitutionChange
+ * @see org.eclipse.emf.compare.uml2.internal.SubstitutionChange
* @generated
*/
public Adapter createSubstitutionChangeAdapter() {
@@ -218,13 +218,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.ExtendChange <em>Extend Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ExtendChange <em>Extend Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.ExtendChange
+ * @see org.eclipse.emf.compare.uml2.internal.ExtendChange
* @generated
*/
public Adapter createExtendChangeAdapter() {
@@ -232,13 +232,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.IncludeChange <em>Include Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.IncludeChange <em>Include Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.IncludeChange
+ * @see org.eclipse.emf.compare.uml2.internal.IncludeChange
* @generated
*/
public Adapter createIncludeChangeAdapter() {
@@ -246,13 +246,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.GeneralizationSetChange <em>Generalization Set Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange <em>Generalization Set Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.GeneralizationSetChange
+ * @see org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange
* @generated
*/
public Adapter createGeneralizationSetChangeAdapter() {
@@ -260,13 +260,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.ExecutionSpecificationChange <em>Execution Specification Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange <em>Execution Specification Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.ExecutionSpecificationChange
+ * @see org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange
* @generated
*/
public Adapter createExecutionSpecificationChangeAdapter() {
@@ -274,13 +274,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.IntervalConstraintChange <em>Interval Constraint Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange <em>Interval Constraint Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.IntervalConstraintChange
+ * @see org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange
* @generated
*/
public Adapter createIntervalConstraintChangeAdapter() {
@@ -288,13 +288,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.MessageChange <em>Message Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.MessageChange <em>Message Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.MessageChange
+ * @see org.eclipse.emf.compare.uml2.internal.MessageChange
* @generated
*/
public Adapter createMessageChangeAdapter() {
@@ -302,13 +302,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.StereotypePropertyChange <em>Stereotype Property Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange <em>Stereotype Property Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.StereotypePropertyChange
+ * @see org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange
* @generated
*/
public Adapter createStereotypePropertyChangeAdapter() {
@@ -316,13 +316,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.StereotypeApplicationChange <em>Stereotype Application Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange <em>Stereotype Application Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.StereotypeApplicationChange
+ * @see org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange
* @generated
*/
public Adapter createStereotypeApplicationChangeAdapter() {
@@ -330,13 +330,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.StereotypeReferenceChange <em>Stereotype Reference Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange <em>Stereotype Reference Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.StereotypeReferenceChange
+ * @see org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange
* @generated
*/
public Adapter createStereotypeReferenceChangeAdapter() {
@@ -344,13 +344,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.ProfileApplicationChange <em>Profile Application Change</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange <em>Profile Application Change</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.ProfileApplicationChange
+ * @see org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange
* @generated
*/
public Adapter createProfileApplicationChangeAdapter() {
@@ -358,13 +358,13 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.UMLDiff <em>UML Diff</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff <em>UML Diff</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.compare.uml2.UMLDiff
+ * @see org.eclipse.emf.compare.uml2.internal.UMLDiff
* @generated
*/
public Adapter createUMLDiffAdapter() {
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareSwitch.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java index 7bee4815b..f9faa3205 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareSwitch.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java @@ -8,13 +8,13 @@ * Contributors:
* Obeo - initial API and implementation
*/
-package org.eclipse.emf.compare.uml2.util;
+package org.eclipse.emf.compare.uml2.internal.util;
import java.util.List;
import org.eclipse.emf.compare.Diff;
-import org.eclipse.emf.compare.uml2.*;
+import org.eclipse.emf.compare.uml2.internal.*;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.EObject; * until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see org.eclipse.emf.compare.uml2.UMLComparePackage
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage
* @generated
*/
public class UMLCompareSwitch<T> {
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/UMLDiffMessages.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/UMLCompareMessages.java index 96a201a80..f0c01f1ff 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/UMLDiffMessages.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/UMLCompareMessages.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2; +package org.eclipse.emf.compare.uml2.internal; import java.text.MessageFormat; import java.util.MissingResourceException; @@ -19,9 +19,9 @@ import java.util.ResourceBundle; * * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a> */ -public final class UMLDiffMessages { +public final class UMLCompareMessages { /** Full qualified path to the properties file in which to seek the keys. */ - private static final String BUNDLE_NAME = "org.eclipse.emf.compare.uml2.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.eclipse.emf.compare.uml2.internal.messages"; //$NON-NLS-1$ /** Contains the locale specific {@link String}s needed by this plug-in. */ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); @@ -29,7 +29,7 @@ public final class UMLDiffMessages { /** * Utility classes don't need to (and shouldn't) be instantiated. */ - private UMLDiffMessages() { + private UMLCompareMessages() { // prevents instantiation } @@ -59,8 +59,9 @@ public final class UMLDiffMessages { * @see MessageFormat#format(String, Object[]) */ public static String getString(String key, Object... arguments) { - if (arguments == null) + if (arguments == null) { return getString(key); + } return MessageFormat.format(getString(key), arguments); } } diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/UMLDiffEnginePlugin.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/UMLComparePlugin.java index 66f5e6546..cf8f95f33 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/UMLDiffEnginePlugin.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/UMLComparePlugin.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2; +package org.eclipse.emf.compare.uml2.internal; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; @@ -18,18 +18,18 @@ import org.osgi.framework.BundleContext; * * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a> */ -public class UMLDiffEnginePlugin extends Plugin { +public class UMLComparePlugin extends Plugin { /** The plugin ID. */ public static final String PLUGIN_ID = "org.eclipse.emf.compare.diff.uml"; //$NON-NLS-1$ /** This plug-in's shared instance. */ - private static UMLDiffEnginePlugin plugin; + private static UMLComparePlugin plugin; /** * Default constructor. */ - public UMLDiffEnginePlugin() { + public UMLComparePlugin() { plugin = this; } @@ -38,7 +38,7 @@ public class UMLDiffEnginePlugin extends Plugin { * * @return the shared instance */ - public static UMLDiffEnginePlugin getDefault() { + public static UMLComparePlugin getDefault() { return plugin; } diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/merge/UMLDiffMerger.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/merge/UMLMerger.java index e0f50f050..55b9f8a23 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/merge/UMLDiffMerger.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/merge/UMLMerger.java @@ -8,21 +8,21 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.merge;
+package org.eclipse.emf.compare.uml2.internal.merge;
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.merge.AbstractMerger;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
/**
* Specific implementation of {@link AbstractMerger} for UML differences.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
*/
-public class UMLDiffMerger extends AbstractMerger {
+public class UMLMerger extends AbstractMerger {
/**
* {@inheritDoc}
*
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/messages.properties b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/messages.properties index 03b9bd984..03b9bd984 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/messages.properties +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/messages.properties diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/UMLDiffExtensionPostProcessor.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/UMLPostProcessor.java index 870925356..2e18a33a5 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/UMLDiffExtensionPostProcessor.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/UMLPostProcessor.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff;
+package org.eclipse.emf.compare.uml2.internal.postprocessor;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -31,16 +31,16 @@ import org.eclipse.emf.compare.DifferenceSource; import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.postprocessor.AbstractPostProcessor;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.DiffExtensionFactoryRegistry;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.IDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.DiffExtensionFactoryRegistry;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.IDiffExtensionFactory;
import org.eclipse.emf.compare.utils.ReferenceUtil;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.uml2.common.util.SubsetSupersetEObjectEList;
-public class UMLDiffExtensionPostProcessor extends AbstractPostProcessor {
+public class UMLPostProcessor extends AbstractPostProcessor {
/** UML2 extensions factories. */
private Set<IDiffExtensionFactory> uml2ExtensionFactories;
@@ -72,7 +72,7 @@ public class UMLDiffExtensionPostProcessor extends AbstractPostProcessor { */
private static final Field SUBSET_FEATURES_FIELD = getSubsetField();
- public UMLDiffExtensionPostProcessor() {
+ public UMLPostProcessor() {
super(Pattern.compile("http://www.eclipse.org/uml2/\\d.\\d.\\d/UML"), null);
}
@@ -80,7 +80,7 @@ public class UMLDiffExtensionPostProcessor extends AbstractPostProcessor { * @param nsURI
* @param resourceURI
*/
- public UMLDiffExtensionPostProcessor(Pattern nsURI, Pattern resourceURI) {
+ public UMLPostProcessor(Pattern nsURI, Pattern resourceURI) {
super(nsURI, resourceURI);
}
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/AbstractDiffExtensionFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/AbstractDiffExtensionFactory.java index 148ea0dc2..16aeaf0f9 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/AbstractDiffExtensionFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/AbstractDiffExtensionFactory.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2.diff.internal.extension; +package org.eclipse.emf.compare.uml2.internal.postprocessor.extension; import static com.google.common.base.Predicates.instanceOf; @@ -30,10 +30,10 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.Match; import org.eclipse.emf.compare.ReferenceChange; import org.eclipse.emf.compare.ResourceAttachmentChange; -import org.eclipse.emf.compare.uml2.AssociationChange; -import org.eclipse.emf.compare.uml2.InterfaceRealizationChange; -import org.eclipse.emf.compare.uml2.StereotypeApplicationChange; -import org.eclipse.emf.compare.uml2.UMLDiff; +import org.eclipse.emf.compare.uml2.internal.AssociationChange; +import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange; +import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange; +import org.eclipse.emf.compare.uml2.internal.UMLDiff; import org.eclipse.emf.compare.util.CompareSwitch; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; @@ -113,7 +113,7 @@ public abstract class AbstractDiffExtensionFactory implements IDiffExtensionFact /** * {@inheritDoc} * - * @see org.eclipse.emf.compare.uml2.diff.internal.extension.IDiffExtensionFactory#handles(org.eclipse.emf.compare.diff.metamodel.DiffElement) + * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.IDiffExtensionFactory#handles(org.eclipse.emf.compare.diff.metamodel.DiffElement) */ public boolean handles(Diff input) { return getRelatedExtensionKind(input) != null && !isExtensionAlreadyExist(input) @@ -123,7 +123,7 @@ public abstract class AbstractDiffExtensionFactory implements IDiffExtensionFact /** * {@inheritDoc} * - * @see org.eclipse.emf.compare.uml2.diff.internal.extension.IDiffExtensionFactory#create(org.eclipse.emf. + * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.IDiffExtensionFactory#create(org.eclipse.emf. * compare.diff.metamodel.DiffElement) */ public Diff create(Diff input) { diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/DiffExtensionFactoryRegistry.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/DiffExtensionFactoryRegistry.java index 497fb1fd4..f9d6cf895 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/DiffExtensionFactoryRegistry.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/DiffExtensionFactoryRegistry.java @@ -8,7 +8,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2.diff.internal.extension; +package org.eclipse.emf.compare.uml2.internal.postprocessor.extension; import java.util.ArrayList; import java.util.Collections; @@ -17,18 +17,18 @@ import java.util.List; import java.util.Map; import org.eclipse.emf.compare.Diff; -import org.eclipse.emf.compare.uml2.diff.internal.extension.clazz.UMLAssociationChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.clazz.UMLDependencyChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.clazz.UMLGeneralizationSetChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.clazz.UMLInterfaceRealizationChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.clazz.UMLSubstitutionChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.profile.UMLProfileApplicationChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.profile.UMLStereotypeApplicationChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.sequence.UMLExecutionSpecificationChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.sequence.UMLIntervalConstraintChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.sequence.UMLMessageChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.usecase.UMLExtendChangeFactory; -import org.eclipse.emf.compare.uml2.diff.internal.extension.usecase.UMLIncludeChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLAssociationChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLGeneralizationSetChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLInterfaceRealizationChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLSubstitutionChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.profile.UMLProfileApplicationChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.profile.UMLStereotypeApplicationChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence.UMLExecutionSpecificationChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence.UMLIntervalConstraintChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence.UMLMessageChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase.UMLExtendChangeFactory; +import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase.UMLIncludeChangeFactory; /** * Registry of all {@link IDiffExtensionFactory}. diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/IDiffExtensionFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/IDiffExtensionFactory.java index d155279b5..16307d3a9 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/IDiffExtensionFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/IDiffExtensionFactory.java @@ -8,12 +8,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.emf.compare.uml2.diff.internal.extension; +package org.eclipse.emf.compare.uml2.internal.postprocessor.extension; import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.Match; -import org.eclipse.emf.compare.uml2.UMLDiff; +import org.eclipse.emf.compare.uml2.internal.UMLDiff; /** * An {@link IDiffExtensionFactory} is a factory capable to create an {@link AbstractDiffExtension} from a diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLAssociationChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLAssociationChangeFactory.java index 7e53094c8..1a540d084 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLAssociationChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLAssociationChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.clazz;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;
import java.util.ArrayList;
import java.util.List;
@@ -16,10 +16,10 @@ import java.util.List; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.AssociationChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.AssociationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.uml2.uml.Association;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLDependencyChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLDependencyChangeFactory.java index a1b303df3..94e484b54 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLDependencyChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLDependencyChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.clazz;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;
import java.util.ArrayList;
import java.util.List;
@@ -16,10 +16,10 @@ import java.util.List; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.DependencyChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.DependencyChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLGeneralizationSetChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLGeneralizationSetChangeFactory.java index c3be49aa6..9d33f9f70 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLGeneralizationSetChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLGeneralizationSetChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.clazz;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;
import java.util.ArrayList;
import java.util.List;
@@ -16,10 +16,10 @@ import java.util.List; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.GeneralizationSetChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.uml2.uml.GeneralizationSet;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLInterfaceRealizationChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLInterfaceRealizationChangeFactory.java index a9856b2ca..b3694d9ce 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLInterfaceRealizationChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLInterfaceRealizationChangeFactory.java @@ -8,15 +8,15 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.clazz;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.uml2.uml.InterfaceRealization;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLSubstitutionChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLSubstitutionChangeFactory.java index d70b83782..44ee40504 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/clazz/UMLSubstitutionChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLSubstitutionChangeFactory.java @@ -8,15 +8,15 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.clazz;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.SubstitutionChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.uml2.uml.Substitution;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/profile/UMLProfileApplicationChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/profile/UMLProfileApplicationChangeFactory.java index 9114e63c6..a280ceb5b 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/profile/UMLProfileApplicationChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/profile/UMLProfileApplicationChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.profile;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.profile;
import java.util.ArrayList;
import java.util.Iterator;
@@ -19,11 +19,11 @@ import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.compare.utils.ReferenceUtil;
import org.eclipse.emf.ecore.EAnnotation;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/profile/UMLStereotypeApplicationChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/profile/UMLStereotypeApplicationChangeFactory.java index 60754cd1a..e5e6e01eb 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/profile/UMLStereotypeApplicationChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/profile/UMLStereotypeApplicationChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.profile;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.profile;
import java.util.ArrayList;
import java.util.Iterator;
@@ -21,12 +21,12 @@ import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.ResourceAttachmentChange;
-import org.eclipse.emf.compare.uml2.ProfileApplicationChange;
-import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
-import org.eclipse.emf.compare.uml2.diff.internal.util.UMLCompareUtil;
+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.util.UMLCompareUtil;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.compare.utils.ReferenceUtil;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/sequence/UMLExecutionSpecificationChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/sequence/UMLExecutionSpecificationChangeFactory.java index 25deb2f2f..5ec3a0d2b 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/sequence/UMLExecutionSpecificationChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/sequence/UMLExecutionSpecificationChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.sequence;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence;
import java.util.ArrayList;
import java.util.List;
@@ -16,10 +16,10 @@ import java.util.List; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/sequence/UMLIntervalConstraintChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/sequence/UMLIntervalConstraintChangeFactory.java index 0c56304a5..c6cdd723c 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/sequence/UMLIntervalConstraintChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/sequence/UMLIntervalConstraintChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.sequence;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence;
import com.google.common.base.Predicate;
@@ -18,10 +18,10 @@ import java.util.List; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.IntervalConstraintChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/sequence/UMLMessageChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/sequence/UMLMessageChangeFactory.java index c9a978b13..1b8555866 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/sequence/UMLMessageChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/sequence/UMLMessageChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.sequence;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence;
import java.util.ArrayList;
import java.util.List;
@@ -16,10 +16,10 @@ import java.util.List; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.MessageChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.MessageChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/usecase/UMLExtendChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLExtendChangeFactory.java index 94ae67159..e80b7320a 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/usecase/UMLExtendChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLExtendChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.usecase;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase;
import java.util.ArrayList;
import java.util.List;
@@ -16,10 +16,10 @@ import java.util.List; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.ExtendChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.ExtendChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.uml2.uml.Extend;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/usecase/UMLIncludeChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLIncludeChangeFactory.java index b0456328b..de9cd6431 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/extension/usecase/UMLIncludeChangeFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLIncludeChangeFactory.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.extension.usecase;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase;
import java.util.ArrayList;
import java.util.List;
@@ -16,10 +16,10 @@ import java.util.List; import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.ReferenceChange;
-import org.eclipse.emf.compare.uml2.IncludeChange;
-import org.eclipse.emf.compare.uml2.UMLCompareFactory;
-import org.eclipse.emf.compare.uml2.UMLDiff;
-import org.eclipse.emf.compare.uml2.diff.internal.extension.AbstractDiffExtensionFactory;
+import org.eclipse.emf.compare.uml2.internal.IncludeChange;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.AbstractDiffExtensionFactory;
import org.eclipse.emf.compare.utils.MatchUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.uml2.uml.Include;
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/subsets.of.containment.properties b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/subsets.of.containment.properties index eeab8989d..eeab8989d 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/subsets.of.containment.properties +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/subsets.of.containment.properties diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/util/UMLCompareUtil.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/util/UMLCompareUtil.java index f61e9a0b2..e5c32c58d 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/diff/internal/util/UMLCompareUtil.java +++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/util/UMLCompareUtil.java @@ -8,7 +8,7 @@ * Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.diff.internal.util;
+package org.eclipse.emf.compare.uml2.internal.postprocessor.util;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
|