Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2015-06-16 04:09:39 -0400
committerLaurent Goubet2015-06-18 03:40:43 -0400
commitf7825720f65b8ff9d6af446997b48e747bbebd67 (patch)
tree36fca9810214956322253b1a316e87e430fc7ca0
parent4c120198fa6b1384fd0c5934cd71856f17ef3a30 (diff)
downloadorg.eclipse.emf.compare-f7825720f65b8ff9d6af446997b48e747bbebd67.tar.gz
org.eclipse.emf.compare-f7825720f65b8ff9d6af446997b48e747bbebd67.tar.xz
org.eclipse.emf.compare-f7825720f65b8ff9d6af446997b48e747bbebd67.zip
Add new UML DanglingStereotypeApplication concept
Change-Id: If8decb2bd5de9f00c65c787b06772cd38bb52ffc Signed-off-by: Axel Richard <axel.richard@obeo.fr>
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java8
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java5
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DanglingStereotypeApplication.gifbin0 -> 129 bytes
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/AssociationChangeItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DanglingStereotypeApplicationItemProvider.java161
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DirectedRelationshipChangeItemProvider.java5
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExecutionSpecificationChangeItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExtendChangeItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/GeneralizationSetChangeItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IntervalConstraintChangeItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/MessageChangeItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/OpaqueElementBodyChangeItemProvider.java29
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ProfileApplicationChangeItemProvider.java31
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeApplicationChangeItemProvider.java27
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeAttributeChangeItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeReferenceChangeItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypedElementChangeItemProvider.java7
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareEditPlugin.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java23
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLDiffItemProvider.java52
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/EMFCompareUML2EditMessages.java79
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/edit_messages.properties12
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/DanglingStereotypeApplicationCustomItemProvider.java75
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/UMLCompareCustomItemProviderAdapterFactory.java12
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/plugin.xml4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/UMLDanglingStereotypeApplicationAccessor.java71
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/factory/UMLDanglingStereotypeApplicationAccessorFactory.java69
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/mergeviewer/item/impl/DanglingStereotypeApplicationMergeViewerItem.java105
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore1
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/AssociationChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DanglingStereotypeApplication.java26
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DirectedRelationshipChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExecutionSpecificationChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExtendChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/GeneralizationSetChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IntervalConstraintChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/MessageChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ProfileApplicationChange.java18
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeApplicationChange.java19
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeAttributeChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeReferenceChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypedElementChange.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java66
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java1220
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLDiff.java24
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DanglingStereotypeApplicationImpl.java274
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ProfileApplicationChangeImpl.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeApplicationChangeImpl.java10
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java63
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java148
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLDiffImpl.java18
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java186
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java181
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLDanglingStereotypeApplicationFactory.java81
63 files changed, 2273 insertions, 979 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java
index 20e269140..a0b7362d8 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/TreeNodeCompareInputLabelProvider.java
@@ -200,9 +200,11 @@ public class TreeNodeCompareInputLabelProvider implements ICompareInputLabelProv
}
private StoragePathAdapter getStoragePathAdapter(Resource resource) {
- for (Adapter adapter : resource.eAdapters()) {
- if (adapter instanceof StoragePathAdapter) {
- return (StoragePathAdapter)adapter;
+ if (resource != null) {
+ for (Adapter adapter : resource.eAdapters()) {
+ if (adapter instanceof StoragePathAdapter) {
+ return (StoragePathAdapter)adapter;
+ }
}
}
return null;
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java
index e85e0f73f..f8525c76c 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java
@@ -119,9 +119,10 @@ public class ResourceAttachmentChangeMergeViewerItem extends MergeViewerItem.Con
}
private boolean isUnrelated(ResourceAttachmentChange change, Object resource) {
+ final String resourceURI = change.getResourceURI();
return resource == null
- || (resource instanceof Resource && !change.getResourceURI().equals(
- ((Resource)resource).getURI().toString()));
+ || (resource instanceof Resource && resourceURI != null && !resourceURI
+ .equals(((Resource)resource).getURI().toString()));
}
/**
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 3bf4b3c71..02c7bd83f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.uml2.edit;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.compare.uml2.internal.provider.UMLCompareEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DanglingStereotypeApplication.gif b/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DanglingStereotypeApplication.gif
new file mode 100644
index 000000000..ef56c1408
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DanglingStereotypeApplication.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
index 80fc1f524..6270b66ba 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2011, 2014 Obeo.
+# Copyright (c) 2011, 2015 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
@@ -169,3 +169,4 @@ _UI_OpaqueElementBodyChange_language_feature = Language
#Error messaged
Unable_To_Retreive_Icon_Error_Message = "Unable to retrieve the icon at location {0}
+_UI_DanglingStereotypeApplication_type = Dangling Stereotype Application
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
index 339dbddfe..c67ead258 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.uml2.edit</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/AssociationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/AssociationChangeItemProvider.java
index f688db93e..9ebeb14d1 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/AssociationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/AssociationChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -26,8 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class AssociationChangeItemProvider
- extends UMLDiffItemProvider {
+public class AssociationChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -74,9 +72,8 @@ public class AssociationChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((AssociationChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_AssociationChange_type") : //$NON-NLS-1$
- getString("_UI_AssociationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_AssociationChange_type") : //$NON-NLS-1$
+ getString("_UI_AssociationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DanglingStereotypeApplicationItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DanglingStereotypeApplicationItemProvider.java
new file mode 100644
index 000000000..00ec2b1a6
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DanglingStereotypeApplicationItemProvider.java
@@ -0,0 +1,161 @@
+/**
+ * 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
+ */
+package org.eclipse.emf.compare.uml2.internal.provider;
+
+import java.util.Collection;
+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.ResourceAttachmentChangeItemProvider;
+
+import org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication;
+
+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DanglingStereotypeApplicationItemProvider extends ResourceAttachmentChangeItemProvider {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public DanglingStereotypeApplicationItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addDiscriminantPropertyDescriptor(object);
+ addEReferencePropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Discriminant feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addDiscriminantPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_UMLDiff_discriminant_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_UMLDiff_discriminant_feature", "_UI_UMLDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ UMLComparePackage.Literals.UML_DIFF__DISCRIMINANT, true, false, true, null, null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the EReference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addEReferencePropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
+ .getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_UMLDiff_eReference_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_UMLDiff_eReference_feature", "_UI_UMLDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ UMLComparePackage.Literals.UML_DIFF__EREFERENCE, true, false, true, null, null, null));
+ }
+
+ /**
+ * This returns DanglingStereotypeApplication.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/DanglingStereotypeApplication")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ DifferenceKind labelValue = ((DanglingStereotypeApplication)object).getKind();
+ String label = labelValue == null ? null : labelValue.toString();
+ return label == null || label.length() == 0 ? getString("_UI_DanglingStereotypeApplication_type") : //$NON-NLS-1$
+ getString("_UI_DanglingStereotypeApplication_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return UMLCompareEditPlugin.INSTANCE;
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DirectedRelationshipChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DirectedRelationshipChangeItemProvider.java
index 2d7f9cb7c..bca134f42 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DirectedRelationshipChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DirectedRelationshipChangeItemProvider.java
@@ -70,9 +70,8 @@ public class DirectedRelationshipChangeItemProvider extends UMLDiffItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((DirectedRelationshipChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_DirectedRelationshipChange_type") : //$NON-NLS-1$
- getString("_UI_DirectedRelationshipChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_DirectedRelationshipChange_type") : //$NON-NLS-1$
+ getString("_UI_DirectedRelationshipChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExecutionSpecificationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExecutionSpecificationChangeItemProvider.java
index 737222792..6db256344 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExecutionSpecificationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExecutionSpecificationChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -26,8 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class ExecutionSpecificationChangeItemProvider
- extends UMLDiffItemProvider {
+public class ExecutionSpecificationChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -74,9 +72,8 @@ public class ExecutionSpecificationChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((ExecutionSpecificationChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_ExecutionSpecificationChange_type") : //$NON-NLS-1$
- getString("_UI_ExecutionSpecificationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_ExecutionSpecificationChange_type") : //$NON-NLS-1$
+ getString("_UI_ExecutionSpecificationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExtendChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExtendChangeItemProvider.java
index a93c86033..2e679b9fb 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExtendChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ExtendChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -26,8 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class ExtendChangeItemProvider
- extends UMLDiffItemProvider {
+public class ExtendChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -74,9 +72,8 @@ public class ExtendChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((ExtendChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_ExtendChange_type") : //$NON-NLS-1$
- getString("_UI_ExtendChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_ExtendChange_type") : //$NON-NLS-1$
+ getString("_UI_ExtendChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/GeneralizationSetChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/GeneralizationSetChangeItemProvider.java
index b4aba3856..dbde73761 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/GeneralizationSetChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/GeneralizationSetChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -26,8 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class GeneralizationSetChangeItemProvider
- extends UMLDiffItemProvider {
+public class GeneralizationSetChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -74,9 +72,8 @@ public class GeneralizationSetChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((GeneralizationSetChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_GeneralizationSetChange_type") : //$NON-NLS-1$
- getString("_UI_GeneralizationSetChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_GeneralizationSetChange_type") : //$NON-NLS-1$
+ getString("_UI_GeneralizationSetChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IntervalConstraintChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IntervalConstraintChangeItemProvider.java
index c92edf788..9a492f5fe 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IntervalConstraintChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IntervalConstraintChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -26,8 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class IntervalConstraintChangeItemProvider
- extends UMLDiffItemProvider {
+public class IntervalConstraintChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -74,9 +72,8 @@ public class IntervalConstraintChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((IntervalConstraintChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_IntervalConstraintChange_type") : //$NON-NLS-1$
- getString("_UI_IntervalConstraintChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_IntervalConstraintChange_type") : //$NON-NLS-1$
+ getString("_UI_IntervalConstraintChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/MessageChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/MessageChangeItemProvider.java
index 6c0ed9c4a..4470dc109 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/MessageChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/MessageChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -26,8 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class MessageChangeItemProvider
- extends UMLDiffItemProvider {
+public class MessageChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -74,9 +72,8 @@ public class MessageChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((MessageChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_MessageChange_type") : //$NON-NLS-1$
- getString("_UI_MessageChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_MessageChange_type") : //$NON-NLS-1$
+ getString("_UI_MessageChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/OpaqueElementBodyChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/OpaqueElementBodyChangeItemProvider.java
index 07d0d305f..9db82bfe2 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/OpaqueElementBodyChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/OpaqueElementBodyChangeItemProvider.java
@@ -24,10 +24,9 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
/**
- * This is the item provider adapter for a
- * {@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange} object. <!-- begin-user-doc --> <!--
+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange} object.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider {
@@ -58,8 +57,8 @@ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider {
}
/**
- * This adds a property descriptor for the Language feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Language feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addLanguagePropertyDescriptor(Object object) {
@@ -75,8 +74,8 @@ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider {
}
/**
- * This returns OpaqueElementBodyChange.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns OpaqueElementBodyChange.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -85,8 +84,8 @@ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider {
}
/**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -98,10 +97,10 @@ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider {
}
/**
- * This handles model notifications by calling {@link #updateChildren} to update any cached children and
- * by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -118,9 +117,9 @@ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider {
}
/**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be
- * created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ProfileApplicationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ProfileApplicationChangeItemProvider.java
index 1a5196cc5..c31c916be 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ProfileApplicationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/ProfileApplicationChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -28,8 +27,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class ProfileApplicationChangeItemProvider
- extends UMLDiffItemProvider {
+public class ProfileApplicationChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -63,19 +61,15 @@ public class ProfileApplicationChangeItemProvider
* @generated
*/
protected void addProfilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ProfileApplicationChange_profile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ProfileApplicationChange_profile_feature", "_UI_ProfileApplicationChange_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- UMLComparePackage.Literals.PROFILE_APPLICATION_CHANGE__PROFILE,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ProfileApplicationChange_profile_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_ProfileApplicationChange_profile_feature", "_UI_ProfileApplicationChange_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ UMLComparePackage.Literals.PROFILE_APPLICATION_CHANGE__PROFILE, true, false, true,
+ null, null, null));
}
/**
@@ -99,9 +93,8 @@ public class ProfileApplicationChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((ProfileApplicationChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_ProfileApplicationChange_type") : //$NON-NLS-1$
- getString("_UI_ProfileApplicationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_ProfileApplicationChange_type") : //$NON-NLS-1$
+ getString("_UI_ProfileApplicationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeApplicationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeApplicationChangeItemProvider.java
index 2fe6b958c..f482ddceb 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeApplicationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeApplicationChangeItemProvider.java
@@ -61,19 +61,15 @@ public class StereotypeApplicationChangeItemProvider extends UMLDiffItemProvider
* @generated
*/
protected void addStereotypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_StereotypeApplicationChange_stereotype_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_StereotypeApplicationChange_stereotype_feature", "_UI_StereotypeApplicationChange_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- UMLComparePackage.Literals.STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_StereotypeApplicationChange_stereotype_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_StereotypeApplicationChange_stereotype_feature", "_UI_StereotypeApplicationChange_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ UMLComparePackage.Literals.STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE, true, false,
+ true, null, null, null));
}
/**
@@ -95,9 +91,8 @@ public class StereotypeApplicationChangeItemProvider extends UMLDiffItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((StereotypeApplicationChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_StereotypeApplicationChange_type") : //$NON-NLS-1$
- getString("_UI_StereotypeApplicationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_StereotypeApplicationChange_type") : //$NON-NLS-1$
+ getString("_UI_StereotypeApplicationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeAttributeChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeAttributeChangeItemProvider.java
index 3f485a639..b1076905e 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeAttributeChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeAttributeChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -26,8 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class StereotypeAttributeChangeItemProvider
- extends UMLDiffItemProvider {
+public class StereotypeAttributeChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -74,9 +72,8 @@ public class StereotypeAttributeChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((StereotypeAttributeChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_StereotypeAttributeChange_type") : //$NON-NLS-1$
- getString("_UI_StereotypeAttributeChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_StereotypeAttributeChange_type") : //$NON-NLS-1$
+ getString("_UI_StereotypeAttributeChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeReferenceChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeReferenceChangeItemProvider.java
index 106d8195f..3e704d805 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeReferenceChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypeReferenceChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -26,8 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class StereotypeReferenceChangeItemProvider
- extends UMLDiffItemProvider {
+public class StereotypeReferenceChangeItemProvider extends UMLDiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -74,9 +72,8 @@ public class StereotypeReferenceChangeItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((StereotypeReferenceChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_StereotypeReferenceChange_type") : //$NON-NLS-1$
- getString("_UI_StereotypeReferenceChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_StereotypeReferenceChange_type") : //$NON-NLS-1$
+ getString("_UI_StereotypeReferenceChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypedElementChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypedElementChangeItemProvider.java
index 016cc6acc..7b4c48f54 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypedElementChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypedElementChangeItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -73,11 +72,9 @@ public class StereotypedElementChangeItemProvider extends UMLDiffItemProvider {
public String getText(Object object) {
DifferenceKind labelValue = ((StereotypedElementChange)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_StereotypedElementChange_type") : //$NON-NLS-1$
- getString("_UI_StereotypedElementChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_StereotypedElementChange_type") : //$NON-NLS-1$
+ getString("_UI_StereotypedElementChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
-
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareEditPlugin.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareEditPlugin.java
index 694bfacd5..d2534caf1 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareEditPlugin.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareEditPlugin.java
@@ -50,12 +50,8 @@ public final class UMLCompareEditPlugin extends EMFPlugin {
* @generated
*/
public UMLCompareEditPlugin() {
- super
- (new ResourceLocator [] {
- EMFCompareEditPlugin.INSTANCE,
- EcoreEditPlugin.INSTANCE,
- UMLEditPlugin.INSTANCE,
- });
+ super(new ResourceLocator[] {EMFCompareEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE,
+ UMLEditPlugin.INSTANCE, });
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java
index 387d2bf8e..24e9feecc 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java
@@ -238,6 +238,29 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
}
/**
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected DanglingStereotypeApplicationItemProvider danglingStereotypeApplicationItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createDanglingStereotypeApplicationAdapter() {
+ if (danglingStereotypeApplicationItemProvider == null) {
+ danglingStereotypeApplicationItemProvider = new DanglingStereotypeApplicationItemProvider(this);
+ }
+
+ return danglingStereotypeApplicationItemProvider;
+ }
+
+ /**
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLDiffItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLDiffItemProvider.java
index 42fcdbc03..3c548794c 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLDiffItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLDiffItemProvider.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.compare.uml2.internal.provider;
-
import java.util.Collection;
import java.util.List;
@@ -30,8 +29,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
* <!-- end-user-doc -->
* @generated
*/
-public class UMLDiffItemProvider
- extends DiffItemProvider {
+public class UMLDiffItemProvider extends DiffItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -66,19 +64,15 @@ public class UMLDiffItemProvider
* @generated
*/
protected void addDiscriminantPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_UMLDiff_discriminant_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_UMLDiff_discriminant_feature", "_UI_UMLDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- UMLComparePackage.Literals.UML_DIFF__DISCRIMINANT,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_UMLDiff_discriminant_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_UMLDiff_discriminant_feature", "_UI_UMLDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ UMLComparePackage.Literals.UML_DIFF__DISCRIMINANT, true, false, true, null, null,
+ null));
}
/**
@@ -88,19 +82,14 @@ public class UMLDiffItemProvider
* @generated
*/
protected void addEReferencePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_UMLDiff_eReference_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_UMLDiff_eReference_feature", "_UI_UMLDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- UMLComparePackage.Literals.UML_DIFF__EREFERENCE,
- true,
- false,
- true,
- null,
- null,
- null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
+ .getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_UMLDiff_eReference_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_UMLDiff_eReference_feature", "_UI_UMLDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ UMLComparePackage.Literals.UML_DIFF__EREFERENCE, true, false, true, null, null, null));
}
/**
@@ -113,9 +102,8 @@ public class UMLDiffItemProvider
public String getText(Object object) {
DifferenceKind labelValue = ((UMLDiff)object).getKind();
String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_UMLDiff_type") : //$NON-NLS-1$
- getString("_UI_UMLDiff_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_UMLDiff_type") : //$NON-NLS-1$
+ getString("_UI_UMLDiff_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/EMFCompareUML2EditMessages.java b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/EMFCompareUML2EditMessages.java
new file mode 100644
index 000000000..ac5c3014c
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/EMFCompareUML2EditMessages.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.uml2.internal;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Utility class to access externalized Strings for this bundle.
+ *
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ */
+public final class EMFCompareUML2EditMessages {
+ /** Fully qualified path to the properties file in which to seek the keys. */
+ private static final String BUNDLE_NAME = "org.eclipse.emf.compare.uml2.internal.edit_messages"; //$NON-NLS-1$
+
+ /** Contains the locale specific {@link String}s needed by this plug-in. */
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+ /**
+ * Utility classes don't need to (and shouldn't) be instantiated.
+ */
+ private EMFCompareUML2EditMessages() {
+ // prevents instantiation
+ }
+
+ /**
+ * Returns a specified {@link String} from the resource bundle.
+ *
+ * @param key
+ * Key of the String we seek.
+ * @return The String from the resource bundle associated with <code>key</code>.
+ */
+ public static String getString(String key) {
+ // Pass through MessageFormat to be consistent in the handling of special chars such as the apostrophe
+ return MessageFormat.format(internalGetString(key), new Object[] {});
+ }
+
+ /**
+ * Returns a String from the resource bundle bound with the given arguments.
+ *
+ * @param key
+ * Key of the String we seek.
+ * @param arguments
+ * Arguments for the String formatting.
+ * @return formatted {@link String}.
+ * @see MessageFormat#format(String, Object[])
+ */
+ public static String getString(String key, Object... arguments) {
+ if (arguments == null) {
+ return getString(key);
+ }
+ return MessageFormat.format(internalGetString(key), arguments);
+ }
+
+ /**
+ * This will return an unformatted String from the resource bundle.
+ *
+ * @param key
+ * Key of the String we seek.
+ * @return An unformatted String from the bundle.
+ */
+ private static String internalGetString(String key) {
+ try {
+ return RESOURCE_BUNDLE.getString(key);
+ } catch (MissingResourceException e) {
+ return '!' + key + '!';
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/edit_messages.properties b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/edit_messages.properties
new file mode 100644
index 000000000..87b5f8f2e
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/edit_messages.properties
@@ -0,0 +1,12 @@
+################################################################################
+# Copyright (c) 2015 Obeo.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Obeo - initial API and implementation
+################################################################################
+## ! note ! double the apostrophes if you need one in the printed String
+DanglingStereotypeApplication.message = dangling stereotype application
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/DanglingStereotypeApplicationCustomItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/DanglingStereotypeApplicationCustomItemProvider.java
new file mode 100644
index 000000000..95cb294e3
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/DanglingStereotypeApplicationCustomItemProvider.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.uml2.internal.provider.custom;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.compare.Match;
+import org.eclipse.emf.compare.provider.ExtendedAdapterFactoryItemDelegator;
+import org.eclipse.emf.compare.provider.utils.ComposedStyledString;
+import org.eclipse.emf.compare.provider.utils.IStyledString.IComposedStyledString;
+import org.eclipse.emf.compare.provider.utils.IStyledString.Style;
+import org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication;
+import org.eclipse.emf.compare.uml2.internal.EMFCompareUML2EditMessages;
+
+/**
+ * A custom {@link org.eclipse.emf.compare.uml2.internal.provider.DanglingStereotypeApplicationItemProvider}
+ * that handles {@link org.eclipse.emf.compare.provider.IItemStyledLabelProvider} and
+ * {@link org.eclipse.emf.compare.provider.IItemDescriptionProvider}.
+ *
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ */
+public class DanglingStereotypeApplicationCustomItemProvider extends UMLDiffCustomItemProvider {
+
+ /** The item delegator to reuse root adapter factory (if any). */
+ private final ExtendedAdapterFactoryItemDelegator itemDelegator;
+
+ /**
+ * This constructs an instance from a factory and a notifier.
+ *
+ * @param adapterFactory
+ * the adapter factory to use.
+ */
+ public DanglingStereotypeApplicationCustomItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ itemDelegator = new ExtendedAdapterFactoryItemDelegator(getRootAdapterFactory());
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.provider.IItemStyledLabelProvider#getStyledText(java.lang.Object)
+ */
+ @Override
+ public IComposedStyledString getStyledText(Object object) {
+ DanglingStereotypeApplication danglingStereotypeApplication = (DanglingStereotypeApplication)object;
+ final Match match = danglingStereotypeApplication.getMatch();
+ String value = itemDelegator.getText(match.getLeft());
+ if (isNullOrEmpty(value)) {
+ value = itemDelegator.getText(match.getRight());
+ }
+ if (isNullOrEmpty(value)) {
+ value = itemDelegator.getText(match.getOrigin());
+ }
+ if (isNullOrEmpty(value)) {
+ value = super.getText(object);
+ }
+
+ ComposedStyledString ret = new ComposedStyledString(value);
+ ret.append(
+ " [" + EMFCompareUML2EditMessages.getString("DanglingStereotypeApplication.message") + "]", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ Style.DECORATIONS_STYLER);
+
+ return ret;
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/UMLCompareCustomItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/UMLCompareCustomItemProviderAdapterFactory.java
index a3181186b..7a0327400 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/UMLCompareCustomItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/UMLCompareCustomItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2012, 2014 Obeo and others.
+ * Copyright (c) 2012, 2015 Obeo and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -119,6 +119,16 @@ public class UMLCompareCustomItemProviderAdapterFactory extends UMLCompareAdapte
/**
* {@inheritDoc}
*
+ * @see UMLCompareAdapterFactory#createDanglingStereotypeApplicationAdapter()
+ */
+ @Override
+ public Adapter createDanglingStereotypeApplicationAdapter() {
+ return new DanglingStereotypeApplicationCustomItemProvider(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
* @see org.eclipse.emf.edit.provider.ComposeableAdapterFactory#getRootAdapterFactory()
*/
public ComposeableAdapterFactory getRootAdapterFactory() {
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF
index b6aa7d51f..46ddd4656 100644
--- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.uml2.rcp.ui;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/plugin.xml b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/plugin.xml
index fce3a4b84..0705d28a3 100644
--- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/plugin.xml
@@ -31,6 +31,10 @@
class="org.eclipse.emf.compare.uml2.rcp.ui.internal.accessor.factory.OpaqueElementBodyChangeAccessorFactory"
ranking="25">
</factory>
+ <factory
+ class="org.eclipse.emf.compare.uml2.rcp.ui.internal.accessor.factory.UMLDanglingStereotypeApplicationAccessorFactory"
+ ranking="25">
+ </factory>
</extension>
<extension
point="org.eclipse.emf.compare.rcp.ui.filters">
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
index 7f62a4e3c..1d49393a2 100644
--- a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.uml2.rcp.ui</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/UMLDanglingStereotypeApplicationAccessor.java b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/UMLDanglingStereotypeApplicationAccessor.java
new file mode 100644
index 000000000..4d36d5a16
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/UMLDanglingStereotypeApplicationAccessor.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.uml2.rcp.ui.internal.accessor;
+
+import com.google.common.collect.ImmutableList;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.impl.ResourceContentsAccessorImpl;
+import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
+import org.eclipse.emf.compare.rcp.ui.mergeviewer.item.IMergeViewerItem;
+import org.eclipse.emf.compare.uml2.rcp.ui.internal.mergeviewer.item.impl.DanglingStereotypeApplicationMergeViewerItem;
+
+/**
+ * A specific {@link ResourceContentsAccessorImpl} for
+ * {@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication} objects.
+ *
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ * @since 2.4
+ */
+@SuppressWarnings("restriction")
+public class UMLDanglingStereotypeApplicationAccessor extends ResourceContentsAccessorImpl {
+
+ /**
+ * Default constructor.
+ *
+ * @param adapterFactory
+ * the adapter factory used to create the accessor.
+ * @param diff
+ * The difference performed.
+ * @param side
+ * The side on which the difference is located.
+ */
+ public UMLDanglingStereotypeApplicationAccessor(AdapterFactory adapterFactory, Diff diff,
+ MergeViewerSide side) {
+ super(adapterFactory, diff, side);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.legacy.ITypedElement#getName()
+ */
+ @Override
+ public String getName() {
+ return UMLDanglingStereotypeApplicationAccessor.class.getName();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.IResourceContentsAccessor#getItems()
+ */
+ @Override
+ public ImmutableList<? extends IMergeViewerItem> getItems() {
+ final ImmutableList<? extends IMergeViewerItem> ret = ImmutableList
+ .of(new DanglingStereotypeApplicationMergeViewerItem(getComparison(), null,
+ getResource(MergeViewerSide.LEFT), getResource(MergeViewerSide.RIGHT),
+ getResource(MergeViewerSide.ANCESTOR), getSide(), getRootAdapterFactory()));
+ return ret;
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/factory/UMLDanglingStereotypeApplicationAccessorFactory.java b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/factory/UMLDanglingStereotypeApplicationAccessorFactory.java
new file mode 100644
index 000000000..fc9332cb5
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/factory/UMLDanglingStereotypeApplicationAccessorFactory.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.uml2.rcp.ui.internal.accessor.factory;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.legacy.ITypedElement;
+import org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.factory.impl.AbstractAccessorFactory;
+import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
+import org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication;
+import org.eclipse.emf.compare.uml2.rcp.ui.internal.accessor.UMLDanglingStereotypeApplicationAccessor;
+
+/**
+ * This will be in charge of creating the accessor for dangling stereotype applications.
+ *
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ * @since 2.4
+ */
+@SuppressWarnings("restriction")
+public class UMLDanglingStereotypeApplicationAccessorFactory extends AbstractAccessorFactory {
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.factory.ide.ui.internal.contentmergeviewer.accessor.IAccessorFactory#isFactoryFor(java.lang.Object)
+ */
+ public boolean isFactoryFor(Object target) {
+ return target instanceof DanglingStereotypeApplication;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.factory.ide.ui.internal.contentmergeviewer.accessor.IAccessorFactory#createLeft(org.eclipse.emf.common.notify.AdapterFactory,
+ * java.lang.Object)
+ */
+ public ITypedElement createLeft(AdapterFactory adapterFactory, Object target) {
+ return new UMLDanglingStereotypeApplicationAccessor(adapterFactory,
+ (DanglingStereotypeApplication)target, MergeViewerSide.LEFT);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.factory.ide.ui.internal.contentmergeviewer.accessor.IAccessorFactory#createRight(org.eclipse.emf.common.notify.AdapterFactory,
+ * java.lang.Object)
+ */
+ public ITypedElement createRight(AdapterFactory adapterFactory, Object target) {
+ return new UMLDanglingStereotypeApplicationAccessor(adapterFactory,
+ (DanglingStereotypeApplication)target, MergeViewerSide.RIGHT);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.compare.rcp.ui.contentmergeviewer.accessor.factory.ide.ui.internal.contentmergeviewer.accessor.IAccessorFactory#createAncestor(org.eclipse.emf.common.notify.AdapterFactory,
+ * java.lang.Object)
+ */
+ public ITypedElement createAncestor(AdapterFactory adapterFactory, Object target) {
+ return new UMLDanglingStereotypeApplicationAccessor(adapterFactory,
+ (DanglingStereotypeApplication)target, MergeViewerSide.ANCESTOR);
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/mergeviewer/item/impl/DanglingStereotypeApplicationMergeViewerItem.java b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/mergeviewer/item/impl/DanglingStereotypeApplicationMergeViewerItem.java
new file mode 100644
index 000000000..3fedacdb1
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/mergeviewer/item/impl/DanglingStereotypeApplicationMergeViewerItem.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.uml2.rcp.ui.internal.mergeviewer.item.impl;
+
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.getFirst;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.Match;
+import org.eclipse.emf.compare.ResourceAttachmentChange;
+import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl.MergeViewerItem;
+import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl.ResourceAttachmentChangeMergeViewerItem;
+import org.eclipse.emf.compare.rcp.ui.internal.util.MergeViewerUtil;
+import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer;
+import org.eclipse.emf.compare.rcp.ui.mergeviewer.IMergeViewer.MergeViewerSide;
+import org.eclipse.emf.compare.rcp.ui.mergeviewer.item.IMergeViewerItem;
+import org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+
+/**
+ * A specific {@link MergeViewerItem} for {@link DanglingStereotypeApplication}.
+ *
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ * @since 2.4
+ */
+@SuppressWarnings("restriction")
+public class DanglingStereotypeApplicationMergeViewerItem extends ResourceAttachmentChangeMergeViewerItem {
+
+ /**
+ * {@inheritDoc}.
+ *
+ * @see
+ * org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl.ResourceAttachmentChangeMergeViewerItem
+ * .ResourceAttachmentChangeMergeViewerItem(Comparison comparison, Diff diff, Object left, Object
+ * right, Object ancestor, MergeViewerSide side, AdapterFactory adapterFactory)
+ */
+ public DanglingStereotypeApplicationMergeViewerItem(Comparison comparison, Diff diff, Resource left,
+ Resource right, Resource ancestor, IMergeViewer.MergeViewerSide side,
+ AdapterFactory adapterFactory) {
+ super(comparison, diff, left, right, ancestor, side, adapterFactory);
+ }
+
+ /**
+ * {@inheritDoc}.
+ *
+ * @see
+ * org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl.ResourceAttachmentChangeMergeViewerItem
+ * .ResourceAttachmentChangeMergeViewerItem(Comparison, Diff, Match, MergeViewerSide, AdapterFactory)
+ */
+ public DanglingStereotypeApplicationMergeViewerItem(Comparison comparison, Diff diff, Match match,
+ IMergeViewer.MergeViewerSide side, AdapterFactory adapterFactory) {
+ super(comparison, diff, match, side, adapterFactory);
+ }
+
+ /**
+ * Creates an IMergeViewerItem from an EObject.
+ *
+ * @param eObject
+ * the given eObject.
+ * @return an IMergeViewerItem.
+ */
+ @Override
+ protected IMergeViewerItem createMergeViewerItemFrom(EObject eObject) {
+
+ Match match = getComparison().getMatch(eObject);
+
+ if (match != null) {
+ ResourceAttachmentChange rac = getFirst(filter(match.getDifferences(),
+ DanglingStereotypeApplication.class), null);
+ if (rac != null) {
+ Object left = match.getLeft();
+ Object right = match.getRight();
+ Object ancestor = match.getOrigin();
+ // Manage case where the resource attachment change is between an existing resource and an
+ // unknown resource
+ if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.LEFT, rac) == null) {
+ left = null;
+ }
+ if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.RIGHT, rac) == null) {
+ right = null;
+ }
+ if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.ANCESTOR, rac) == null) {
+ ancestor = null;
+ }
+
+ return new MergeViewerItem.Container(getComparison(), rac, left, right, ancestor, getSide(),
+ getAdapterFactory());
+ }
+ }
+ return null;
+
+ }
+
+}
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 d58dda05b..cfaadc2d5 100644
--- a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.uml2;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore
index c8c820c2e..c739777ee 100644
--- a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore
+++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore
@@ -24,4 +24,5 @@
<eClassifiers xsi:type="ecore:EClass" name="OpaqueElementBodyChange" eSuperTypes="#//UMLDiff">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DanglingStereotypeApplication" eSuperTypes="platform:/plugin/org.eclipse.emf.compare/model/compare.ecore#//ResourceAttachmentChange #//UMLDiff"/>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel
index 338026b4a..f8fefd693 100644
--- a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel
+++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel
@@ -32,5 +32,9 @@
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//UMLDiff/eReference"/>
</genClasses>
<genClasses provider="Stateful" ecoreClass="uml2compare.ecore#//StereotypedElementChange"/>
+ <genClasses ecoreClass="uml2compare.ecore#//OpaqueElementBodyChange">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute uml2compare.ecore#//OpaqueElementBodyChange/language"/>
+ </genClasses>
+ <genClasses ecoreClass="uml2compare.ecore#//DanglingStereotypeApplication"/>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.compare.uml2/pom.xml b/plugins/org.eclipse.emf.compare.uml2/pom.xml
index 819a5a48c..930263655 100644
--- a/plugins/org.eclipse.emf.compare.uml2/pom.xml
+++ b/plugins/org.eclipse.emf.compare.uml2/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>org.eclipse.emf.compare.uml2</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/AssociationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/AssociationChange.java
index 09817e345..b4840c031 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/AssociationChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/AssociationChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Association Change</b></em>'. <!--
* end-user-doc -->
- *
+ *
+ *
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getAssociationChange()
* @model
* @generated
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DanglingStereotypeApplication.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DanglingStereotypeApplication.java
new file mode 100644
index 000000000..f2d3f682a
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DanglingStereotypeApplication.java
@@ -0,0 +1,26 @@
+/**
+ * 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
+ */
+package org.eclipse.emf.compare.uml2.internal;
+
+import org.eclipse.emf.compare.ResourceAttachmentChange;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dangling Stereotype Application</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getDanglingStereotypeApplication()
+ * @model
+ * @generated
+ */
+public interface DanglingStereotypeApplication extends ResourceAttachmentChange, UMLDiff {
+} // DanglingStereotypeApplication
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DirectedRelationshipChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DirectedRelationshipChange.java
index 86a8afb75..c55801ff6 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DirectedRelationshipChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DirectedRelationshipChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Directed Relationship Change</b></em>
* '. <!-- end-user-doc -->
- *
+ *
+ *
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getDirectedRelationshipChange()
* @model
* @generated
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExecutionSpecificationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExecutionSpecificationChange.java
index dc22ee617..e30f44e20 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExecutionSpecificationChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExecutionSpecificationChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '
* <em><b>Execution Specification Change</b></em>'. <!-- end-user-doc -->
- *
+ *
+ *
* @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/internal/ExtendChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExtendChange.java
index d95be756a..cbd7ada7a 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExtendChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ExtendChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Extend Change</b></em>'. <!--
* end-user-doc -->
- *
+ *
+ *
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getExtendChange()
* @model
* @generated
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/GeneralizationSetChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/GeneralizationSetChange.java
index 19a75716c..2bb436e22 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/GeneralizationSetChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/GeneralizationSetChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Generalization Set Change</b></em>'.
* <!-- end-user-doc -->
- *
+ *
+ *
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getGeneralizationSetChange()
* @model
* @generated
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IntervalConstraintChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IntervalConstraintChange.java
index b14bfe104..0ddaddb75 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IntervalConstraintChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IntervalConstraintChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Interval Constraint Change</b></em>'.
* <!-- end-user-doc -->
- *
+ *
+ *
* @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/internal/MessageChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/MessageChange.java
index 01b5c6c34..215b51772 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/MessageChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/MessageChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Message Change</b></em>'. <!--
* end-user-doc -->
- *
+ *
+ *
* @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/internal/ProfileApplicationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ProfileApplicationChange.java
index 76804151d..859f729d3 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ProfileApplicationChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/ProfileApplicationChange.java
@@ -15,26 +15,27 @@ import org.eclipse.uml2.uml.Profile;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Profile Application Change</b></em>'.
* <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.internal.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.internal.UMLComparePackage#getProfileApplicationChange()
* @model
* @generated
*/
public interface ProfileApplicationChange extends UMLDiff {
/**
- * Returns the value of the '<em><b>Profile</b></em>' reference. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Profile</b></em>' reference.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Profile</em>' reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Profile</em>' reference.
* @see #setProfile(Profile)
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getProfileApplicationChange_Profile()
@@ -44,12 +45,9 @@ public interface ProfileApplicationChange extends UMLDiff {
Profile getProfile();
/**
- * 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.
+ * 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.
* @see #getProfile()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeApplicationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeApplicationChange.java
index 4e10b1c8b..008c64329 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeApplicationChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeApplicationChange.java
@@ -15,27 +15,27 @@ import org.eclipse.uml2.uml.Stereotype;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Stereotype Application Change</b></em>
* '. <!-- end-user-doc -->
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.compare.uml2.internal.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.internal.UMLComparePackage#getStereotypeApplicationChange()
* @model
* @generated
*/
public interface StereotypeApplicationChange extends UMLDiff {
/**
- * Returns the value of the '<em><b>Stereotype</b></em>' reference. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Stereotype</b></em>' reference.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Stereotype</em>' reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Stereotype</em>' reference.
* @see #setStereotype(Stereotype)
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypeApplicationChange_Stereotype()
@@ -45,12 +45,9 @@ public interface StereotypeApplicationChange extends UMLDiff {
Stereotype getStereotype();
/**
- * 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.
+ * 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.
* @see #getStereotype()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeAttributeChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeAttributeChange.java
index 2c2d0268e..044d5a5f1 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeAttributeChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeAttributeChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Stereotype Attribute Change</b></em>'.
* <!-- end-user-doc -->
- *
+ *
+ *
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypeAttributeChange()
* @model
* @generated
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeReferenceChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeReferenceChange.java
index 0fb05dd49..e0126778e 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeReferenceChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypeReferenceChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Stereotype Reference Change</b></em>'.
* <!-- end-user-doc -->
- *
+ *
+ *
* @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/internal/StereotypedElementChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypedElementChange.java
index 248772399..ee4f48062 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypedElementChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypedElementChange.java
@@ -13,7 +13,8 @@ package org.eclipse.emf.compare.uml2.internal;
/**
* <!-- begin-user-doc --> A representation of the model object '<em><b>Stereotyped Element Change</b></em>'.
* <!-- end-user-doc -->
- *
+ *
+ *
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypedElementChange()
* @model
* @generated
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java
index 283c9154a..7f62f99ca 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java
@@ -15,14 +15,13 @@ import org.eclipse.emf.ecore.EFactory;
/**
* <!-- begin-user-doc --> 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.internal.UMLComparePackage
* @generated
*/
public interface UMLCompareFactory extends EFactory {
/**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
UMLCompareFactory eINSTANCE = org.eclipse.emf.compare.uml2.internal.impl.UMLCompareFactoryImpl.init();
@@ -37,114 +36,123 @@ public interface UMLCompareFactory extends EFactory {
AssociationChange createAssociationChange();
/**
- * Returns a new object of class '<em>Extend Change</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Extend Change</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Extend Change</em>'.
* @generated
*/
ExtendChange createExtendChange();
/**
- * Returns a new object of class '<em>Generalization Set Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Generalization Set Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Generalization Set Change</em>'.
* @generated
*/
GeneralizationSetChange createGeneralizationSetChange();
/**
- * Returns a new object of class '<em>Execution Specification Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Execution Specification Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Execution Specification Change</em>'.
* @generated
*/
ExecutionSpecificationChange createExecutionSpecificationChange();
/**
- * Returns a new object of class '<em>Interval Constraint Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Interval Constraint Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Interval Constraint Change</em>'.
* @generated
*/
IntervalConstraintChange createIntervalConstraintChange();
/**
- * Returns a new object of class '<em>Message Change</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Message Change</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Message Change</em>'.
* @generated
*/
MessageChange createMessageChange();
/**
- * Returns a new object of class '<em>Stereotype Attribute Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Stereotype Attribute Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Stereotype Attribute Change</em>'.
* @generated
*/
StereotypeAttributeChange createStereotypeAttributeChange();
/**
- * Returns a new object of class '<em>Stereotype Application Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Stereotype Application Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Stereotype Application Change</em>'.
* @generated
*/
StereotypeApplicationChange createStereotypeApplicationChange();
/**
- * Returns a new object of class '<em>Stereotype Reference Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Stereotype Reference Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Stereotype Reference Change</em>'.
* @generated
*/
StereotypeReferenceChange createStereotypeReferenceChange();
/**
- * Returns a new object of class '<em>Profile Application Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Profile Application Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Profile Application Change</em>'.
* @generated
*/
ProfileApplicationChange createProfileApplicationChange();
/**
- * Returns a new object of class '<em>Directed Relationship Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Directed Relationship Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Directed Relationship Change</em>'.
* @generated
*/
DirectedRelationshipChange createDirectedRelationshipChange();
/**
- * Returns a new object of class '<em>Stereotyped Element Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Stereotyped Element Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Stereotyped Element Change</em>'.
* @generated
*/
StereotypedElementChange createStereotypedElementChange();
/**
- * Returns a new object of class '<em>Opaque Element Body Change</em>'. <!-- begin-user-doc --> <!--
+ * Returns a new object of class '<em>Opaque Element Body Change</em>'.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @return a new object of class '<em>Opaque Element Body Change</em>'.
* @generated
*/
OpaqueElementBodyChange createOpaqueElementBodyChange();
/**
- * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Dangling Stereotype Application</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Dangling Stereotype Application</em>'.
+ * @generated
+ */
+ DanglingStereotypeApplication createDanglingStereotypeApplication();
+
+ /**
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the package supported by this factory.
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java
index cd5103727..50aaec75b 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java
@@ -26,44 +26,42 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
* @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 -->
- *
+ * The package name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNAME = "uml2"; //$NON-NLS-1$
/**
- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package namespace URI.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNS_URI = "http://www.eclipse.org/emf/compare/uml2/2.0"; //$NON-NLS-1$
/**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package namespace name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNS_PREFIX = "umlcompare"; //$NON-NLS-1$
/**
- * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
UMLComparePackage eINSTANCE = org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl.init();
/**
- * 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 -->
- *
+ * 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
@@ -71,80 +69,80 @@ public interface UMLComparePackage extends EPackage {
int UML_DIFF = 11;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__MATCH = ComparePackage.DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__REQUIRES = ComparePackage.DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__REQUIRED_BY = ComparePackage.DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__IMPLIES = ComparePackage.DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__IMPLIED_BY = ComparePackage.DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__REFINES = ComparePackage.DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__REFINED_BY = ComparePackage.DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__PRIME_REFINING = ComparePackage.DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -160,17 +158,17 @@ public interface UMLComparePackage extends EPackage {
int UML_DIFF__SOURCE = ComparePackage.DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int UML_DIFF__STATE = ComparePackage.DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -186,36 +184,35 @@ public interface UMLComparePackage extends EPackage {
int UML_DIFF__CONFLICT = ComparePackage.DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__DISCRIMINANT = ComparePackage.DIFF_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int UML_DIFF__EREFERENCE = ComparePackage.DIFF_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>UML Diff</em>' class. <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>UML Diff</em>' class.
+ * <!-- 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.internal.impl.AssociationChangeImpl
- * <em>Association Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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
@@ -223,80 +220,80 @@ public interface UMLComparePackage extends EPackage {
int ASSOCIATION_CHANGE = 0;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -312,17 +309,17 @@ public interface UMLComparePackage extends EPackage {
int ASSOCIATION_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -338,36 +335,35 @@ public interface UMLComparePackage extends EPackage {
int ASSOCIATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The number of structural features of the '<em>Association Change</em>' class. <!-- begin-user-doc -->
+ * The number of structural features of the '<em>Association Change</em>' class.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
* @ordered
*/
int ASSOCIATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * 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 -->
- *
+ * 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
@@ -375,80 +371,80 @@ public interface UMLComparePackage extends EPackage {
int EXTEND_CHANGE = 1;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -464,17 +460,17 @@ public interface UMLComparePackage extends EPackage {
int EXTEND_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXTEND_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -490,37 +486,35 @@ public interface UMLComparePackage extends EPackage {
int EXTEND_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXTEND_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The number of structural features of the '<em>Extend Change</em>' class. <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Extend Change</em>' class.
+ * <!-- 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.internal.impl.GeneralizationSetChangeImpl
- * <em>Generalization Set Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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
@@ -528,80 +522,80 @@ public interface UMLComparePackage extends EPackage {
int GENERALIZATION_SET_CHANGE = 2;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -617,17 +611,17 @@ public interface UMLComparePackage extends EPackage {
int GENERALIZATION_SET_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -643,18 +637,18 @@ public interface UMLComparePackage extends EPackage {
int GENERALIZATION_SET_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int GENERALIZATION_SET_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -670,10 +664,8 @@ public interface UMLComparePackage extends EPackage {
int GENERALIZATION_SET_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * 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 -->
- *
+ * 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
@@ -681,80 +673,80 @@ public interface UMLComparePackage extends EPackage {
int EXECUTION_SPECIFICATION_CHANGE = 3;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -770,17 +762,17 @@ public interface UMLComparePackage extends EPackage {
int EXECUTION_SPECIFICATION_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -796,18 +788,18 @@ public interface UMLComparePackage extends EPackage {
int EXECUTION_SPECIFICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int EXECUTION_SPECIFICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -823,10 +815,8 @@ public interface UMLComparePackage extends EPackage {
int EXECUTION_SPECIFICATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * 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 -->
- *
+ * 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
@@ -834,80 +824,80 @@ public interface UMLComparePackage extends EPackage {
int INTERVAL_CONSTRAINT_CHANGE = 4;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -923,17 +913,17 @@ public interface UMLComparePackage extends EPackage {
int INTERVAL_CONSTRAINT_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -949,18 +939,18 @@ public interface UMLComparePackage extends EPackage {
int INTERVAL_CONSTRAINT_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int INTERVAL_CONSTRAINT_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -976,9 +966,8 @@ public interface UMLComparePackage extends EPackage {
int INTERVAL_CONSTRAINT_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * 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 -->
- *
+ * 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
@@ -986,80 +975,80 @@ public interface UMLComparePackage extends EPackage {
int MESSAGE_CHANGE = 5;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1075,17 +1064,17 @@ public interface UMLComparePackage extends EPackage {
int MESSAGE_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int MESSAGE_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1101,37 +1090,35 @@ public interface UMLComparePackage extends EPackage {
int MESSAGE_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int MESSAGE_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The number of structural features of the '<em>Message Change</em>' class. <!-- begin-user-doc --> <!--
+ * The number of structural features of the '<em>Message Change</em>' class.
+ * <!-- 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.internal.impl.StereotypeAttributeChangeImpl
- * <em>Stereotype Attribute Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeAttributeChangeImpl <em>Stereotype Attribute Change</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.compare.uml2.internal.impl.StereotypeAttributeChangeImpl
* @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypeAttributeChange()
* @generated
@@ -1139,80 +1126,80 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_ATTRIBUTE_CHANGE = 6;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1228,17 +1215,17 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_ATTRIBUTE_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1254,18 +1241,18 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_ATTRIBUTE_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_ATTRIBUTE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1281,10 +1268,8 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_ATTRIBUTE_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * 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 -->
- *
+ * 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
@@ -1292,80 +1277,80 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_APPLICATION_CHANGE = 7;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1381,17 +1366,17 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_APPLICATION_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1407,27 +1392,27 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_APPLICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_APPLICATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;
/**
- * The feature id for the '<em><b>Stereotype</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Stereotype</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1443,10 +1428,8 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_APPLICATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 1;
/**
- * 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 -->
- *
+ * 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
@@ -1454,80 +1437,80 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_REFERENCE_CHANGE = 8;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1543,17 +1526,17 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_REFERENCE_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1569,18 +1552,18 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_REFERENCE_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPE_REFERENCE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1596,10 +1579,8 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPE_REFERENCE_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * 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 -->
- *
+ * 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
@@ -1607,80 +1588,80 @@ public interface UMLComparePackage extends EPackage {
int PROFILE_APPLICATION_CHANGE = 9;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1696,17 +1677,17 @@ public interface UMLComparePackage extends EPackage {
int PROFILE_APPLICATION_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1722,18 +1703,18 @@ public interface UMLComparePackage extends EPackage {
int PROFILE_APPLICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int PROFILE_APPLICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1758,10 +1739,8 @@ public interface UMLComparePackage extends EPackage {
int PROFILE_APPLICATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 1;
/**
- * The meta object id for the '
- * {@link org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl
- * <em>Directed Relationship Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl <em>Directed Relationship Change</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl
* @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDirectedRelationshipChange()
* @generated
@@ -1769,80 +1748,80 @@ public interface UMLComparePackage extends EPackage {
int DIRECTED_RELATIONSHIP_CHANGE = 10;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -1858,17 +1837,17 @@ public interface UMLComparePackage extends EPackage {
int DIRECTED_RELATIONSHIP_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1884,18 +1863,18 @@ public interface UMLComparePackage extends EPackage {
int DIRECTED_RELATIONSHIP_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int DIRECTED_RELATIONSHIP_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -1911,10 +1890,8 @@ public interface UMLComparePackage extends EPackage {
int DIRECTED_RELATIONSHIP_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '
- * {@link org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl
- * <em>Stereotyped Element Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl <em>Stereotyped Element Change</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl
* @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypedElementChange()
* @generated
@@ -1922,80 +1899,80 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPED_ELEMENT_CHANGE = 12;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -2011,17 +1988,17 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPED_ELEMENT_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -2037,18 +2014,18 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPED_ELEMENT_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int STEREOTYPED_ELEMENT_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -2064,10 +2041,8 @@ public interface UMLComparePackage extends EPackage {
int STEREOTYPED_ELEMENT_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;
/**
- * The meta object id for the '
- * {@link org.eclipse.emf.compare.uml2.internal.impl.OpaqueElementBodyChangeImpl
- * <em>Opaque Element Body Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.OpaqueElementBodyChangeImpl <em>Opaque Element Body Change</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.compare.uml2.internal.impl.OpaqueElementBodyChangeImpl
* @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getOpaqueElementBodyChange()
* @generated
@@ -2075,80 +2050,80 @@ public interface UMLComparePackage extends EPackage {
int OPAQUE_ELEMENT_BODY_CHANGE = 13;
/**
- * The feature id for the '<em><b>Match</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__MATCH = UML_DIFF__MATCH;
/**
- * The feature id for the '<em><b>Requires</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__REQUIRES = UML_DIFF__REQUIRES;
/**
- * The feature id for the '<em><b>Required By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;
/**
- * The feature id for the '<em><b>Implies</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__IMPLIES = UML_DIFF__IMPLIES;
/**
- * The feature id for the '<em><b>Implied By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY;
/**
- * The feature id for the '<em><b>Refines</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__REFINES = UML_DIFF__REFINES;
/**
- * The feature id for the '<em><b>Refined By</b></em>' reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;
/**
- * The feature id for the '<em><b>Prime Refining</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING;
/**
- * The feature id for the '<em><b>Kind</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -2164,17 +2139,17 @@ public interface UMLComparePackage extends EPackage {
int OPAQUE_ELEMENT_BODY_CHANGE__SOURCE = UML_DIFF__SOURCE;
/**
- * The feature id for the '<em><b>State</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__STATE = UML_DIFF__STATE;
/**
- * The feature id for the '<em><b>Equivalence</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -2190,18 +2165,18 @@ public interface UMLComparePackage extends EPackage {
int OPAQUE_ELEMENT_BODY_CHANGE__CONFLICT = UML_DIFF__CONFLICT;
/**
- * The feature id for the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
int OPAQUE_ELEMENT_BODY_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;
/**
- * The feature id for the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -2226,9 +2201,171 @@ public interface UMLComparePackage extends EPackage {
int OPAQUE_ELEMENT_BODY_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 1;
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.AssociationChange
- * <em>Association Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl <em>Dangling Stereotype Application</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDanglingStereotypeApplication()
+ * @generated
+ */
+ int DANGLING_STEREOTYPE_APPLICATION = 14;
+
+ /**
+ * The feature id for the '<em><b>Match</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__MATCH = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__MATCH;
+
+ /**
+ * The feature id for the '<em><b>Requires</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__REQUIRES = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__REQUIRES;
+
+ /**
+ * The feature id for the '<em><b>Required By</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__REQUIRED_BY = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__REQUIRED_BY;
+
+ /**
+ * The feature id for the '<em><b>Implies</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__IMPLIES = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__IMPLIES;
+
+ /**
+ * The feature id for the '<em><b>Implied By</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__IMPLIED_BY = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__IMPLIED_BY;
+
+ /**
+ * The feature id for the '<em><b>Refines</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__REFINES = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__REFINES;
+
+ /**
+ * The feature id for the '<em><b>Refined By</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__REFINED_BY = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__REFINED_BY;
+
+ /**
+ * The feature id for the '<em><b>Prime Refining</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__PRIME_REFINING = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__PRIME_REFINING;
+
+ /**
+ * The feature id for the '<em><b>Kind</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__KIND = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__KIND;
+
+ /**
+ * The feature id for the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__SOURCE = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__SOURCE;
+
+ /**
+ * The feature id for the '<em><b>State</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__STATE = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__STATE;
+
+ /**
+ * The feature id for the '<em><b>Equivalence</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__EQUIVALENCE = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__EQUIVALENCE;
+
+ /**
+ * The feature id for the '<em><b>Conflict</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__CONFLICT = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__CONFLICT;
+
+ /**
+ * The feature id for the '<em><b>Resource URI</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__RESOURCE_URI = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__RESOURCE_URI;
+
+ /**
+ * The feature id for the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT = ComparePackage.RESOURCE_ATTACHMENT_CHANGE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION__EREFERENCE = ComparePackage.RESOURCE_ATTACHMENT_CHANGE_FEATURE_COUNT + 1;
+
+ /**
+ * The number of structural features of the '<em>Dangling Stereotype Application</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DANGLING_STEREOTYPE_APPLICATION_FEATURE_COUNT = ComparePackage.RESOURCE_ATTACHMENT_CHANGE_FEATURE_COUNT + 2;
+
+ /**
+ * 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.internal.AssociationChange
* @generated
@@ -2236,9 +2373,8 @@ public interface UMLComparePackage extends EPackage {
EClass getAssociationChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.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.internal.ExtendChange
* @generated
@@ -2246,10 +2382,8 @@ public interface UMLComparePackage extends EPackage {
EClass getExtendChange();
/**
- * 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 -->
- *
+ * 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.internal.GeneralizationSetChange
* @generated
@@ -2257,10 +2391,8 @@ public interface UMLComparePackage extends EPackage {
EClass getGeneralizationSetChange();
/**
- * 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 -->
- *
+ * 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.internal.ExecutionSpecificationChange
* @generated
@@ -2268,10 +2400,8 @@ public interface UMLComparePackage extends EPackage {
EClass getExecutionSpecificationChange();
/**
- * 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 -->
- *
+ * 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.internal.IntervalConstraintChange
* @generated
@@ -2279,9 +2409,8 @@ public interface UMLComparePackage extends EPackage {
EClass getIntervalConstraintChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.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.internal.MessageChange
* @generated
@@ -2289,10 +2418,8 @@ public interface UMLComparePackage extends EPackage {
EClass getMessageChange();
/**
- * Returns the meta object for class '
- * {@link org.eclipse.emf.compare.uml2.internal.StereotypeAttributeChange
- * <em>Stereotype Attribute Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeAttributeChange <em>Stereotype Attribute Change</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Stereotype Attribute Change</em>'.
* @see org.eclipse.emf.compare.uml2.internal.StereotypeAttributeChange
* @generated
@@ -2300,10 +2427,8 @@ public interface UMLComparePackage extends EPackage {
EClass getStereotypeAttributeChange();
/**
- * 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 -->
- *
+ * 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.internal.StereotypeApplicationChange
* @generated
@@ -2311,10 +2436,8 @@ public interface UMLComparePackage extends EPackage {
EClass getStereotypeApplicationChange();
/**
- * 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 -->
- *
+ * 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.internal.StereotypeApplicationChange#getStereotype()
* @see #getStereotypeApplicationChange()
@@ -2323,10 +2446,8 @@ public interface UMLComparePackage extends EPackage {
EReference getStereotypeApplicationChange_Stereotype();
/**
- * 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 -->
- *
+ * 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.internal.StereotypeReferenceChange
* @generated
@@ -2334,10 +2455,8 @@ public interface UMLComparePackage extends EPackage {
EClass getStereotypeReferenceChange();
/**
- * 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 -->
- *
+ * 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.internal.ProfileApplicationChange
* @generated
@@ -2345,10 +2464,8 @@ public interface UMLComparePackage extends EPackage {
EClass getProfileApplicationChange();
/**
- * Returns the meta object for the reference '
- * {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile <em>Profile</em>}'.
+ * 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.internal.ProfileApplicationChange#getProfile()
* @see #getProfileApplicationChange()
@@ -2357,10 +2474,8 @@ public interface UMLComparePackage extends EPackage {
EReference getProfileApplicationChange_Profile();
/**
- * Returns the meta object for class '
- * {@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange
- * <em>Directed Relationship Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange <em>Directed Relationship Change</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Directed Relationship Change</em>'.
* @see org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange
* @generated
@@ -2368,9 +2483,8 @@ public interface UMLComparePackage extends EPackage {
EClass getDirectedRelationshipChange();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.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.internal.UMLDiff
* @generated
@@ -2402,10 +2516,8 @@ public interface UMLComparePackage extends EPackage {
EReference getUMLDiff_EReference();
/**
- * Returns the meta object for class '
- * {@link org.eclipse.emf.compare.uml2.internal.StereotypedElementChange
- * <em>Stereotyped Element Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypedElementChange <em>Stereotyped Element Change</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Stereotyped Element Change</em>'.
* @see org.eclipse.emf.compare.uml2.internal.StereotypedElementChange
* @generated
@@ -2413,10 +2525,8 @@ public interface UMLComparePackage extends EPackage {
EClass getStereotypedElementChange();
/**
- * Returns the meta object for class '
- * {@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange
- * <em>Opaque Element Body Change</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange <em>Opaque Element Body Change</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for class '<em>Opaque Element Body Change</em>'.
* @see org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange
* @generated
@@ -2424,10 +2534,8 @@ public interface UMLComparePackage extends EPackage {
EClass getOpaqueElementBodyChange();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange#getLanguage <em>Language</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange#getLanguage <em>Language</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the meta object for the attribute '<em>Language</em>'.
* @see org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange#getLanguage()
* @see #getOpaqueElementBodyChange()
@@ -2436,6 +2544,16 @@ public interface UMLComparePackage extends EPackage {
EAttribute getOpaqueElementBodyChange_Language();
/**
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication <em>Dangling Stereotype Application</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Dangling Stereotype Application</em>'.
+ * @see org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication
+ * @generated
+ */
+ EClass getDanglingStereotypeApplication();
+
+ /**
* Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc
* -->
*
@@ -2453,17 +2571,14 @@ public interface UMLComparePackage extends EPackage {
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("hiding")
// generated code, removing warnings
interface Literals {
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl
- * <em>Association Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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
@@ -2471,10 +2586,8 @@ public interface UMLComparePackage extends EPackage {
EClass ASSOCIATION_CHANGE = eINSTANCE.getAssociationChange();
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl <em>Extend Change</em>}' class.
+ * 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
@@ -2482,10 +2595,8 @@ public interface UMLComparePackage extends EPackage {
EClass EXTEND_CHANGE = eINSTANCE.getExtendChange();
/**
- * 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 -->
- *
+ * 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
@@ -2493,10 +2604,8 @@ public interface UMLComparePackage extends EPackage {
EClass GENERALIZATION_SET_CHANGE = eINSTANCE.getGeneralizationSetChange();
/**
- * 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 -->
- *
+ * 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
@@ -2504,10 +2613,8 @@ public interface UMLComparePackage extends EPackage {
EClass EXECUTION_SPECIFICATION_CHANGE = eINSTANCE.getExecutionSpecificationChange();
/**
- * 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 -->
- *
+ * 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
@@ -2515,10 +2622,8 @@ public interface UMLComparePackage extends EPackage {
EClass INTERVAL_CONSTRAINT_CHANGE = eINSTANCE.getIntervalConstraintChange();
/**
- * 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 -->
- *
+ * 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
@@ -2526,10 +2631,8 @@ public interface UMLComparePackage extends EPackage {
EClass MESSAGE_CHANGE = eINSTANCE.getMessageChange();
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeAttributeChangeImpl
- * <em>Stereotype Attribute Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeAttributeChangeImpl <em>Stereotype Attribute Change</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.compare.uml2.internal.impl.StereotypeAttributeChangeImpl
* @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypeAttributeChange()
* @generated
@@ -2537,10 +2640,8 @@ public interface UMLComparePackage extends EPackage {
EClass STEREOTYPE_ATTRIBUTE_CHANGE = eINSTANCE.getStereotypeAttributeChange();
/**
- * 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 -->
- *
+ * 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
@@ -2548,19 +2649,17 @@ public interface UMLComparePackage extends EPackage {
EClass STEREOTYPE_APPLICATION_CHANGE = eINSTANCE.getStereotypeApplicationChange();
/**
- * The meta object literal for the '<em><b>Stereotype</b></em>' reference feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>Stereotype</b></em>' reference feature.
+ * <!-- 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.internal.impl.StereotypeReferenceChangeImpl
- * <em>Stereotype Reference Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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
@@ -2568,10 +2667,8 @@ public interface UMLComparePackage extends EPackage {
EClass STEREOTYPE_REFERENCE_CHANGE = eINSTANCE.getStereotypeReferenceChange();
/**
- * 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 -->
- *
+ * 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
@@ -2579,18 +2676,16 @@ public interface UMLComparePackage extends EPackage {
EClass PROFILE_APPLICATION_CHANGE = eINSTANCE.getProfileApplicationChange();
/**
- * The meta object literal for the '<em><b>Profile</b></em>' reference feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>Profile</b></em>' reference feature.
+ * <!-- 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.internal.impl.DirectedRelationshipChangeImpl
- * <em>Directed Relationship Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl <em>Directed Relationship Change</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl
* @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDirectedRelationshipChange()
* @generated
@@ -2598,9 +2693,8 @@ public interface UMLComparePackage extends EPackage {
EClass DIRECTED_RELATIONSHIP_CHANGE = eINSTANCE.getDirectedRelationshipChange();
/**
- * 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 -->
- *
+ * 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
@@ -2616,18 +2710,16 @@ public interface UMLComparePackage extends EPackage {
EReference UML_DIFF__DISCRIMINANT = eINSTANCE.getUMLDiff_Discriminant();
/**
- * The meta object literal for the '<em><b>EReference</b></em>' reference feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>EReference</b></em>' reference feature.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @generated
*/
EReference UML_DIFF__EREFERENCE = eINSTANCE.getUMLDiff_EReference();
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl
- * <em>Stereotyped Element Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl <em>Stereotyped Element Change</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl
* @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypedElementChange()
* @generated
@@ -2635,10 +2727,8 @@ public interface UMLComparePackage extends EPackage {
EClass STEREOTYPED_ELEMENT_CHANGE = eINSTANCE.getStereotypedElementChange();
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.compare.uml2.internal.impl.OpaqueElementBodyChangeImpl
- * <em>Opaque Element Body Change</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.OpaqueElementBodyChangeImpl <em>Opaque Element Body Change</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.compare.uml2.internal.impl.OpaqueElementBodyChangeImpl
* @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getOpaqueElementBodyChange()
* @generated
@@ -2646,13 +2736,23 @@ public interface UMLComparePackage extends EPackage {
EClass OPAQUE_ELEMENT_BODY_CHANGE = eINSTANCE.getOpaqueElementBodyChange();
/**
- * The meta object literal for the '<em><b>Language</b></em>' attribute feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>Language</b></em>' attribute feature.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @generated
*/
EAttribute OPAQUE_ELEMENT_BODY_CHANGE__LANGUAGE = eINSTANCE.getOpaqueElementBodyChange_Language();
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl <em>Dangling Stereotype Application</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl
+ * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDanglingStereotypeApplication()
+ * @generated
+ */
+ EClass DANGLING_STEREOTYPE_APPLICATION = eINSTANCE.getDanglingStereotypeApplication();
+
}
} // UMLComparePackage
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLDiff.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLDiff.java
index 170762a70..5dd5b639c 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLDiff.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLDiff.java
@@ -32,13 +32,13 @@ import org.eclipse.emf.ecore.EReference;
*/
public interface UMLDiff extends Diff {
/**
- * Returns the value of the '<em><b>Discriminant</b></em>' reference. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Discriminant</b></em>' reference.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Discriminant</em>' reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Discriminant</em>' reference.
* @see #setDiscriminant(EObject)
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getUMLDiff_Discriminant()
@@ -48,24 +48,22 @@ public interface UMLDiff extends Diff {
EObject getDiscriminant();
/**
- * 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.
+ * 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.
* @see #getDiscriminant()
* @generated
*/
void setDiscriminant(EObject value);
/**
- * Returns the value of the '<em><b>EReference</b></em>' reference. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>EReference</b></em>' reference.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>EReference</em>' reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>EReference</em>' reference.
* @see #setEReference(EReference)
* @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getUMLDiff_EReference()
@@ -75,11 +73,9 @@ public interface UMLDiff extends Diff {
EReference getEReference();
/**
- * 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.
+ * 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.
* @see #getEReference()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DanglingStereotypeApplicationImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DanglingStereotypeApplicationImpl.java
new file mode 100644
index 000000000..53504e8d6
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DanglingStereotypeApplicationImpl.java
@@ -0,0 +1,274 @@
+/**
+ * Copyright (c) 2012, 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ */
+package org.eclipse.emf.compare.uml2.internal.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.compare.impl.ResourceAttachmentChangeImpl;
+import org.eclipse.emf.compare.internal.spec.ResourceAttachmentChangeSpec;
+import org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication;
+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>Dangling Stereotype Application</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl#getDiscriminant <em>Discriminant</em>}</li>
+ * <li>{@link org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl#getEReference <em>EReference</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DanglingStereotypeApplicationImpl extends ResourceAttachmentChangeSpec implements DanglingStereotypeApplication {
+ /**
+ * The cached value of the '{@link #getDiscriminant() <em>Discriminant</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDiscriminant()
+ * @generated
+ * @ordered
+ */
+ protected EObject discriminant;
+
+ /**
+ * The cached value of the '{@link #getEReference() <em>EReference</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getEReference()
+ * @generated
+ * @ordered
+ */
+ protected EReference eReference;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected DanglingStereotypeApplicationImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return UMLComparePackage.Literals.DANGLING_STEREOTYPE_APPLICATION;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EObject getDiscriminant() {
+ if (discriminant != null && discriminant.eIsProxy()) {
+ InternalEObject oldDiscriminant = (InternalEObject)discriminant;
+ discriminant = eResolveProxy(oldDiscriminant);
+ if (discriminant != oldDiscriminant) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT, oldDiscriminant,
+ discriminant));
+ }
+ }
+ return discriminant;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EObject basicGetDiscriminant() {
+ return discriminant;
+ }
+
+ /**
+ * <!-- 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.DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT, oldDiscriminant,
+ discriminant));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getEReference() {
+ if (eReference != null && eReference.eIsProxy()) {
+ InternalEObject oldEReference = (InternalEObject)eReference;
+ eReference = (EReference)eResolveProxy(oldEReference);
+ if (eReference != oldEReference) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__EREFERENCE, oldEReference,
+ eReference));
+ }
+ }
+ return eReference;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference basicGetEReference() {
+ return eReference;
+ }
+
+ /**
+ * <!-- 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.DANGLING_STEREOTYPE_APPLICATION__EREFERENCE, oldEReference, eReference));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT:
+ if (resolve)
+ return getDiscriminant();
+ return basicGetDiscriminant();
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__EREFERENCE:
+ if (resolve)
+ return getEReference();
+ return basicGetEReference();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT:
+ setDiscriminant((EObject)newValue);
+ return;
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__EREFERENCE:
+ setEReference((EReference)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT:
+ setDiscriminant((EObject)null);
+ return;
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__EREFERENCE:
+ setEReference((EReference)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT:
+ return discriminant != null;
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__EREFERENCE:
+ return eReference != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+ if (baseClass == UMLDiff.class) {
+ switch (derivedFeatureID) {
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT:
+ return UMLComparePackage.UML_DIFF__DISCRIMINANT;
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__EREFERENCE:
+ return UMLComparePackage.UML_DIFF__EREFERENCE;
+ default:
+ return -1;
+ }
+ }
+ return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+ if (baseClass == UMLDiff.class) {
+ switch (baseFeatureID) {
+ case UMLComparePackage.UML_DIFF__DISCRIMINANT:
+ return UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT;
+ case UMLComparePackage.UML_DIFF__EREFERENCE:
+ return UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION__EREFERENCE;
+ default:
+ return -1;
+ }
+ }
+ return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+ }
+
+} //DanglingStereotypeApplicationImpl
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ProfileApplicationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ProfileApplicationChangeImpl.java
index 15202df19..865e2a81c 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ProfileApplicationChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/ProfileApplicationChangeImpl.java
@@ -69,7 +69,8 @@ public class ProfileApplicationChangeImpl extends UMLDiffSpec implements Profile
profile = (Profile)eResolveProxy(oldProfile);
if (profile != oldProfile) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLComparePackage.PROFILE_APPLICATION_CHANGE__PROFILE, oldProfile, profile));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ UMLComparePackage.PROFILE_APPLICATION_CHANGE__PROFILE, oldProfile, profile));
}
}
return profile;
@@ -91,7 +92,8 @@ public class ProfileApplicationChangeImpl extends UMLDiffSpec implements Profile
Profile oldProfile = profile;
profile = newProfile;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.PROFILE_APPLICATION_CHANGE__PROFILE, oldProfile, profile));
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ UMLComparePackage.PROFILE_APPLICATION_CHANGE__PROFILE, oldProfile, profile));
}
/**
@@ -102,7 +104,8 @@ public class ProfileApplicationChangeImpl extends UMLDiffSpec implements Profile
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLComparePackage.PROFILE_APPLICATION_CHANGE__PROFILE:
- if (resolve) return getProfile();
+ if (resolve)
+ return getProfile();
return basicGetProfile();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeApplicationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeApplicationChangeImpl.java
index 8e5c61f83..1c0be3d69 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeApplicationChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypeApplicationChangeImpl.java
@@ -69,7 +69,9 @@ public class StereotypeApplicationChangeImpl extends UMLDiffSpec implements Ster
stereotype = (Stereotype)eResolveProxy(oldStereotype);
if (stereotype != oldStereotype) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE, oldStereotype, stereotype));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE, oldStereotype,
+ stereotype));
}
}
return stereotype;
@@ -91,7 +93,8 @@ public class StereotypeApplicationChangeImpl extends UMLDiffSpec implements Ster
Stereotype oldStereotype = stereotype;
stereotype = newStereotype;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE, oldStereotype, stereotype));
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE, oldStereotype, stereotype));
}
/**
@@ -102,7 +105,8 @@ public class StereotypeApplicationChangeImpl extends UMLDiffSpec implements Ster
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE:
- if (resolve) return getStereotype();
+ if (resolve)
+ return getStereotype();
return basicGetStereotype();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java
index 8f40a3ecc..6867e7a8b 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java
@@ -10,6 +10,7 @@
*/
package org.eclipse.emf.compare.uml2.internal.impl;
+import org.eclipse.emf.compare.uml2.internal.*;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;
import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
@@ -43,12 +44,12 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
*/
public static UMLCompareFactory init() {
try {
- UMLCompareFactory theUMLCompareFactory = (UMLCompareFactory)EPackage.Registry.INSTANCE.getEFactory(UMLComparePackage.eNS_URI);
+ UMLCompareFactory theUMLCompareFactory = (UMLCompareFactory)EPackage.Registry.INSTANCE
+ .getEFactory(UMLComparePackage.eNS_URI);
if (theUMLCompareFactory != null) {
return theUMLCompareFactory;
}
- }
- catch (Exception exception) {
+ } catch (Exception exception) {
EcorePlugin.INSTANCE.log(exception);
}
return new UMLCompareFactoryImpl();
@@ -70,21 +71,37 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
@Override
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
- case UMLComparePackage.ASSOCIATION_CHANGE: return createAssociationChange();
- case UMLComparePackage.EXTEND_CHANGE: return createExtendChange();
- case UMLComparePackage.GENERALIZATION_SET_CHANGE: return createGeneralizationSetChange();
- case UMLComparePackage.EXECUTION_SPECIFICATION_CHANGE: return createExecutionSpecificationChange();
- case UMLComparePackage.INTERVAL_CONSTRAINT_CHANGE: return createIntervalConstraintChange();
- case UMLComparePackage.MESSAGE_CHANGE: return createMessageChange();
- case UMLComparePackage.STEREOTYPE_ATTRIBUTE_CHANGE: return createStereotypeAttributeChange();
- case UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE: return createStereotypeApplicationChange();
- case UMLComparePackage.STEREOTYPE_REFERENCE_CHANGE: return createStereotypeReferenceChange();
- case UMLComparePackage.PROFILE_APPLICATION_CHANGE: return createProfileApplicationChange();
- case UMLComparePackage.DIRECTED_RELATIONSHIP_CHANGE: return createDirectedRelationshipChange();
- case UMLComparePackage.STEREOTYPED_ELEMENT_CHANGE: return createStereotypedElementChange();
- case UMLComparePackage.OPAQUE_ELEMENT_BODY_CHANGE: return createOpaqueElementBodyChange();
+ case UMLComparePackage.ASSOCIATION_CHANGE:
+ return createAssociationChange();
+ case UMLComparePackage.EXTEND_CHANGE:
+ return createExtendChange();
+ case UMLComparePackage.GENERALIZATION_SET_CHANGE:
+ return createGeneralizationSetChange();
+ case UMLComparePackage.EXECUTION_SPECIFICATION_CHANGE:
+ return createExecutionSpecificationChange();
+ case UMLComparePackage.INTERVAL_CONSTRAINT_CHANGE:
+ return createIntervalConstraintChange();
+ case UMLComparePackage.MESSAGE_CHANGE:
+ return createMessageChange();
+ case UMLComparePackage.STEREOTYPE_ATTRIBUTE_CHANGE:
+ return createStereotypeAttributeChange();
+ case UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE:
+ return createStereotypeApplicationChange();
+ case UMLComparePackage.STEREOTYPE_REFERENCE_CHANGE:
+ return createStereotypeReferenceChange();
+ case UMLComparePackage.PROFILE_APPLICATION_CHANGE:
+ return createProfileApplicationChange();
+ case UMLComparePackage.DIRECTED_RELATIONSHIP_CHANGE:
+ return createDirectedRelationshipChange();
+ case UMLComparePackage.STEREOTYPED_ELEMENT_CHANGE:
+ return createStereotypedElementChange();
+ case UMLComparePackage.OPAQUE_ELEMENT_BODY_CHANGE:
+ return createOpaqueElementBodyChange();
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION:
+ return createDanglingStereotypeApplication();
default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new IllegalArgumentException(
+ "The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -195,7 +212,7 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
StereotypedElementChangeImpl stereotypedElementChange = new StereotypedElementChangeImpl();
return stereotypedElementChange;
}
-
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -207,6 +224,16 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public DanglingStereotypeApplication createDanglingStereotypeApplication() {
+ DanglingStereotypeApplicationImpl danglingStereotypeApplication = new DanglingStereotypeApplicationImpl();
+ return danglingStereotypeApplication;
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java
index 686af35e9..a6cf18c4e 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.compare.uml2.internal.impl;
import org.eclipse.emf.compare.ComparePackage;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
+import org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication;
import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;
import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
import org.eclipse.emf.compare.uml2.internal.ExtendChange;
@@ -119,7 +120,7 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
* @generated
*/
private EClass stereotypedElementChangeEClass = null;
-
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -128,6 +129,13 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
private EClass opaqueElementBodyChangeEClass = null;
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass danglingStereotypeApplicationEClass = null;
+
+ /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -163,10 +171,13 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
* @generated
*/
public static UMLComparePackage init() {
- if (isInited) return (UMLComparePackage)EPackage.Registry.INSTANCE.getEPackage(UMLComparePackage.eNS_URI);
+ if (isInited)
+ return (UMLComparePackage)EPackage.Registry.INSTANCE.getEPackage(UMLComparePackage.eNS_URI);
// Obtain or create and register package
- UMLComparePackageImpl theUMLComparePackage = (UMLComparePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLComparePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLComparePackageImpl());
+ UMLComparePackageImpl theUMLComparePackage = (UMLComparePackageImpl)(EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof UMLComparePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new UMLComparePackageImpl());
isInited = true;
@@ -183,7 +194,6 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
// Mark meta-data to indicate it can't be changed
theUMLComparePackage.freeze();
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(UMLComparePackage.eNS_URI, theUMLComparePackage);
return theUMLComparePackage;
@@ -326,7 +336,7 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
public EClass getStereotypedElementChange() {
return stereotypedElementChangeEClass;
}
-
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -346,6 +356,15 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getDanglingStereotypeApplication() {
+ return danglingStereotypeApplicationEClass;
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@@ -366,7 +385,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
* @generated
*/
public void createPackageContents() {
- if (isCreated) return;
+ if (isCreated)
+ return;
isCreated = true;
// Create classes and their features
@@ -399,9 +419,11 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
createEReference(umlDiffEClass, UML_DIFF__EREFERENCE);
stereotypedElementChangeEClass = createEClass(STEREOTYPED_ELEMENT_CHANGE);
-
+
opaqueElementBodyChangeEClass = createEClass(OPAQUE_ELEMENT_BODY_CHANGE);
createEAttribute(opaqueElementBodyChangeEClass, OPAQUE_ELEMENT_BODY_CHANGE__LANGUAGE);
+
+ danglingStereotypeApplicationEClass = createEClass(DANGLING_STEREOTYPE_APPLICATION);
}
/**
@@ -417,7 +439,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) return;
+ if (isInitialized)
+ return;
isInitialized = true;
// Initialize package
@@ -427,8 +450,10 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
// Obtain other dependent packages
UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
- ComparePackage theComparePackage = (ComparePackage)EPackage.Registry.INSTANCE.getEPackage(ComparePackage.eNS_URI);
- EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+ ComparePackage theComparePackage = (ComparePackage)EPackage.Registry.INSTANCE
+ .getEPackage(ComparePackage.eNS_URI);
+ EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE
+ .getEPackage(EcorePackage.eNS_URI);
// Create type parameters
@@ -449,40 +474,79 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
umlDiffEClass.getESuperTypes().add(theComparePackage.getDiff());
stereotypedElementChangeEClass.getESuperTypes().add(this.getUMLDiff());
opaqueElementBodyChangeEClass.getESuperTypes().add(this.getUMLDiff());
+ danglingStereotypeApplicationEClass.getESuperTypes().add(
+ theComparePackage.getResourceAttachmentChange());
+ danglingStereotypeApplicationEClass.getESuperTypes().add(this.getUMLDiff());
// Initialize classes and features; add operations and parameters
- initEClass(associationChangeEClass, AssociationChange.class, "AssociationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(extendChangeEClass, ExtendChange.class, "ExtendChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(generalizationSetChangeEClass, GeneralizationSetChange.class, "GeneralizationSetChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(executionSpecificationChangeEClass, ExecutionSpecificationChange.class, "ExecutionSpecificationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(intervalConstraintChangeEClass, IntervalConstraintChange.class, "IntervalConstraintChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(messageChangeEClass, MessageChange.class, "MessageChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(stereotypeAttributeChangeEClass, StereotypeAttributeChange.class, "StereotypeAttributeChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(stereotypeApplicationChangeEClass, StereotypeApplicationChange.class, "StereotypeApplicationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getStereotypeApplicationChange_Stereotype(), theUMLPackage.getStereotype(), null, "stereotype", null, 0, 1, StereotypeApplicationChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(stereotypeReferenceChangeEClass, StereotypeReferenceChange.class, "StereotypeReferenceChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(profileApplicationChangeEClass, ProfileApplicationChange.class, "ProfileApplicationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getProfileApplicationChange_Profile(), theUMLPackage.getProfile(), null, "profile", null, 0, 1, ProfileApplicationChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(directedRelationshipChangeEClass, DirectedRelationshipChange.class, "DirectedRelationshipChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(umlDiffEClass, UMLDiff.class, "UMLDiff", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getUMLDiff_Discriminant(), theEcorePackage.getEObject(), null, "discriminant", null, 0, 1, UMLDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getUMLDiff_EReference(), theEcorePackage.getEReference(), null, "eReference", null, 0, 1, UMLDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(stereotypedElementChangeEClass, StereotypedElementChange.class, "StereotypedElementChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(opaqueElementBodyChangeEClass, OpaqueElementBodyChange.class, "OpaqueElementBodyChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getOpaqueElementBodyChange_Language(), ecorePackage.getEString(), "language", null, 0, 1, OpaqueElementBodyChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(associationChangeEClass, AssociationChange.class,
+ "AssociationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(extendChangeEClass, ExtendChange.class,
+ "ExtendChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(generalizationSetChangeEClass, GeneralizationSetChange.class,
+ "GeneralizationSetChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(executionSpecificationChangeEClass, ExecutionSpecificationChange.class,
+ "ExecutionSpecificationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(intervalConstraintChangeEClass, IntervalConstraintChange.class,
+ "IntervalConstraintChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(messageChangeEClass, MessageChange.class,
+ "MessageChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(stereotypeAttributeChangeEClass, StereotypeAttributeChange.class,
+ "StereotypeAttributeChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(stereotypeApplicationChangeEClass, StereotypeApplicationChange.class,
+ "StereotypeApplicationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(
+ getStereotypeApplicationChange_Stereotype(),
+ theUMLPackage.getStereotype(),
+ null,
+ "stereotype", null, 0, 1, StereotypeApplicationChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(stereotypeReferenceChangeEClass, StereotypeReferenceChange.class,
+ "StereotypeReferenceChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(profileApplicationChangeEClass, ProfileApplicationChange.class,
+ "ProfileApplicationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(
+ getProfileApplicationChange_Profile(),
+ theUMLPackage.getProfile(),
+ null,
+ "profile", null, 0, 1, ProfileApplicationChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(directedRelationshipChangeEClass, DirectedRelationshipChange.class,
+ "DirectedRelationshipChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(umlDiffEClass, UMLDiff.class,
+ "UMLDiff", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(
+ getUMLDiff_Discriminant(),
+ theEcorePackage.getEObject(),
+ null,
+ "discriminant", null, 0, 1, UMLDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(
+ getUMLDiff_EReference(),
+ theEcorePackage.getEReference(),
+ null,
+ "eReference", null, 0, 1, UMLDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(stereotypedElementChangeEClass, StereotypedElementChange.class,
+ "StereotypedElementChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(opaqueElementBodyChangeEClass, OpaqueElementBodyChange.class,
+ "OpaqueElementBodyChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(
+ getOpaqueElementBodyChange_Language(),
+ ecorePackage.getEString(),
+ "language", null, 0, 1, OpaqueElementBodyChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(danglingStereotypeApplicationEClass, DanglingStereotypeApplication.class,
+ "DanglingStereotypeApplication", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
// Create resource
createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLDiffImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLDiffImpl.java
index 67c5c4a0f..9ff18b74c 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLDiffImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLDiffImpl.java
@@ -83,7 +83,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff {
discriminant = eResolveProxy(oldDiscriminant);
if (discriminant != oldDiscriminant) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLComparePackage.UML_DIFF__DISCRIMINANT, oldDiscriminant, discriminant));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ UMLComparePackage.UML_DIFF__DISCRIMINANT, oldDiscriminant, discriminant));
}
}
return discriminant;
@@ -105,7 +106,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff {
EObject oldDiscriminant = discriminant;
discriminant = newDiscriminant;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.UML_DIFF__DISCRIMINANT, oldDiscriminant, discriminant));
+ eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.UML_DIFF__DISCRIMINANT,
+ oldDiscriminant, discriminant));
}
/**
@@ -118,7 +120,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff {
eReference = (EReference)eResolveProxy(oldEReference);
if (eReference != oldEReference) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLComparePackage.UML_DIFF__EREFERENCE, oldEReference, eReference));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ UMLComparePackage.UML_DIFF__EREFERENCE, oldEReference, eReference));
}
}
return eReference;
@@ -140,7 +143,8 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff {
EReference oldEReference = eReference;
eReference = newEReference;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.UML_DIFF__EREFERENCE, oldEReference, eReference));
+ eNotify(new ENotificationImpl(this, Notification.SET, UMLComparePackage.UML_DIFF__EREFERENCE,
+ oldEReference, eReference));
}
/**
@@ -164,10 +168,12 @@ public abstract class UMLDiffImpl extends DiffImpl implements UMLDiff {
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);
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java
index f98429e1d..7d63b8f76 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.ResourceAttachmentChange;
import org.eclipse.emf.compare.uml2.internal.*;
import org.eclipse.emf.ecore.EObject;
@@ -68,71 +69,96 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
* @generated
*/
protected UMLCompareSwitch<Adapter> modelSwitch = new UMLCompareSwitch<Adapter>() {
- @Override
- public Adapter caseAssociationChange(AssociationChange object) {
- return createAssociationChangeAdapter();
- }
- @Override
- public Adapter caseExtendChange(ExtendChange object) {
- return createExtendChangeAdapter();
- }
- @Override
- public Adapter caseGeneralizationSetChange(GeneralizationSetChange object) {
- return createGeneralizationSetChangeAdapter();
- }
- @Override
- public Adapter caseExecutionSpecificationChange(ExecutionSpecificationChange object) {
- return createExecutionSpecificationChangeAdapter();
- }
- @Override
- public Adapter caseIntervalConstraintChange(IntervalConstraintChange object) {
- return createIntervalConstraintChangeAdapter();
- }
- @Override
- public Adapter caseMessageChange(MessageChange object) {
- return createMessageChangeAdapter();
- }
- @Override
- public Adapter caseStereotypeAttributeChange(StereotypeAttributeChange object) {
- return createStereotypeAttributeChangeAdapter();
- }
- @Override
- public Adapter caseStereotypeApplicationChange(StereotypeApplicationChange object) {
- return createStereotypeApplicationChangeAdapter();
- }
- @Override
- public Adapter caseStereotypeReferenceChange(StereotypeReferenceChange object) {
- return createStereotypeReferenceChangeAdapter();
- }
- @Override
- public Adapter caseProfileApplicationChange(ProfileApplicationChange object) {
- return createProfileApplicationChangeAdapter();
- }
- @Override
- public Adapter caseDirectedRelationshipChange(DirectedRelationshipChange object) {
- return createDirectedRelationshipChangeAdapter();
- }
- @Override
- public Adapter caseUMLDiff(UMLDiff object) {
- return createUMLDiffAdapter();
- }
- @Override
- public Adapter caseStereotypedElementChange(StereotypedElementChange object) {
- return createStereotypedElementChangeAdapter();
- }
- @Override
- public Adapter caseOpaqueElementBodyChange(OpaqueElementBodyChange object) {
- return createOpaqueElementBodyChangeAdapter();
- }
- @Override
- public Adapter caseDiff(Diff object) {
- return createDiffAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ @Override
+ public Adapter caseAssociationChange(AssociationChange object) {
+ return createAssociationChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseExtendChange(ExtendChange object) {
+ return createExtendChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseGeneralizationSetChange(GeneralizationSetChange object) {
+ return createGeneralizationSetChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseExecutionSpecificationChange(ExecutionSpecificationChange object) {
+ return createExecutionSpecificationChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseIntervalConstraintChange(IntervalConstraintChange object) {
+ return createIntervalConstraintChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseMessageChange(MessageChange object) {
+ return createMessageChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseStereotypeAttributeChange(StereotypeAttributeChange object) {
+ return createStereotypeAttributeChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseStereotypeApplicationChange(StereotypeApplicationChange object) {
+ return createStereotypeApplicationChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseStereotypeReferenceChange(StereotypeReferenceChange object) {
+ return createStereotypeReferenceChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseProfileApplicationChange(ProfileApplicationChange object) {
+ return createProfileApplicationChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseDirectedRelationshipChange(DirectedRelationshipChange object) {
+ return createDirectedRelationshipChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseUMLDiff(UMLDiff object) {
+ return createUMLDiffAdapter();
+ }
+
+ @Override
+ public Adapter caseStereotypedElementChange(StereotypedElementChange object) {
+ return createStereotypedElementChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseOpaqueElementBodyChange(OpaqueElementBodyChange object) {
+ return createOpaqueElementBodyChangeAdapter();
+ }
+
+ @Override
+ public Adapter caseDanglingStereotypeApplication(DanglingStereotypeApplication object) {
+ return createDanglingStereotypeApplicationAdapter();
+ }
+
+ @Override
+ public Adapter caseDiff(Diff object) {
+ return createDiffAdapter();
+ }
+
+ @Override
+ public Adapter caseResourceAttachmentChange(ResourceAttachmentChange object) {
+ return createResourceAttachmentChangeAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -317,7 +343,7 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
public Adapter createStereotypedElementChangeAdapter() {
return null;
}
-
+
/**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange <em>Opaque Element Body Change</em>}'.
* <!-- begin-user-doc -->
@@ -333,6 +359,20 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication <em>Dangling Stereotype Application</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication
+ * @generated
+ */
+ public Adapter createDanglingStereotypeApplicationAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.Diff <em>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 -->
@@ -346,6 +386,20 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.ResourceAttachmentChange <em>Resource Attachment 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.ResourceAttachmentChange
+ * @generated
+ */
+ public Adapter createResourceAttachmentChangeAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case.
* <!-- begin-user-doc --> This default implementation returns
* null. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java
index 496d3097d..0b1c31129 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java
@@ -13,6 +13,8 @@ package org.eclipse.emf.compare.uml2.internal.util;
import java.util.List;
import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.ResourceAttachmentChange;
+import org.eclipse.emf.compare.uml2.internal.*;
import org.eclipse.emf.compare.uml2.internal.AssociationChange;
import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;
import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;
@@ -77,13 +79,9 @@ public class UMLCompareSwitch<T> {
protected T doSwitch(EClass theEClass, EObject theEObject) {
if (theEClass.eContainer() == modelPackage) {
return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
+ } else {
List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
}
}
@@ -98,115 +96,170 @@ public class UMLCompareSwitch<T> {
case UMLComparePackage.ASSOCIATION_CHANGE: {
AssociationChange associationChange = (AssociationChange)theEObject;
T result = caseAssociationChange(associationChange);
- if (result == null) result = caseUMLDiff(associationChange);
- if (result == null) result = caseDiff(associationChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(associationChange);
+ if (result == null)
+ result = caseDiff(associationChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.EXTEND_CHANGE: {
ExtendChange extendChange = (ExtendChange)theEObject;
T result = caseExtendChange(extendChange);
- if (result == null) result = caseUMLDiff(extendChange);
- if (result == null) result = caseDiff(extendChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(extendChange);
+ if (result == null)
+ result = caseDiff(extendChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.GENERALIZATION_SET_CHANGE: {
GeneralizationSetChange generalizationSetChange = (GeneralizationSetChange)theEObject;
T result = caseGeneralizationSetChange(generalizationSetChange);
- if (result == null) result = caseUMLDiff(generalizationSetChange);
- if (result == null) result = caseDiff(generalizationSetChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(generalizationSetChange);
+ if (result == null)
+ result = caseDiff(generalizationSetChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.EXECUTION_SPECIFICATION_CHANGE: {
ExecutionSpecificationChange executionSpecificationChange = (ExecutionSpecificationChange)theEObject;
T result = caseExecutionSpecificationChange(executionSpecificationChange);
- if (result == null) result = caseUMLDiff(executionSpecificationChange);
- if (result == null) result = caseDiff(executionSpecificationChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(executionSpecificationChange);
+ if (result == null)
+ result = caseDiff(executionSpecificationChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.INTERVAL_CONSTRAINT_CHANGE: {
IntervalConstraintChange intervalConstraintChange = (IntervalConstraintChange)theEObject;
T result = caseIntervalConstraintChange(intervalConstraintChange);
- if (result == null) result = caseUMLDiff(intervalConstraintChange);
- if (result == null) result = caseDiff(intervalConstraintChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(intervalConstraintChange);
+ if (result == null)
+ result = caseDiff(intervalConstraintChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.MESSAGE_CHANGE: {
MessageChange messageChange = (MessageChange)theEObject;
T result = caseMessageChange(messageChange);
- if (result == null) result = caseUMLDiff(messageChange);
- if (result == null) result = caseDiff(messageChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(messageChange);
+ if (result == null)
+ result = caseDiff(messageChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.STEREOTYPE_ATTRIBUTE_CHANGE: {
StereotypeAttributeChange stereotypeAttributeChange = (StereotypeAttributeChange)theEObject;
T result = caseStereotypeAttributeChange(stereotypeAttributeChange);
- if (result == null) result = caseUMLDiff(stereotypeAttributeChange);
- if (result == null) result = caseDiff(stereotypeAttributeChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(stereotypeAttributeChange);
+ if (result == null)
+ result = caseDiff(stereotypeAttributeChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE: {
StereotypeApplicationChange stereotypeApplicationChange = (StereotypeApplicationChange)theEObject;
T result = caseStereotypeApplicationChange(stereotypeApplicationChange);
- if (result == null) result = caseUMLDiff(stereotypeApplicationChange);
- if (result == null) result = caseDiff(stereotypeApplicationChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(stereotypeApplicationChange);
+ if (result == null)
+ result = caseDiff(stereotypeApplicationChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.STEREOTYPE_REFERENCE_CHANGE: {
StereotypeReferenceChange stereotypeReferenceChange = (StereotypeReferenceChange)theEObject;
T result = caseStereotypeReferenceChange(stereotypeReferenceChange);
- if (result == null) result = caseUMLDiff(stereotypeReferenceChange);
- if (result == null) result = caseDiff(stereotypeReferenceChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(stereotypeReferenceChange);
+ if (result == null)
+ result = caseDiff(stereotypeReferenceChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.PROFILE_APPLICATION_CHANGE: {
ProfileApplicationChange profileApplicationChange = (ProfileApplicationChange)theEObject;
T result = caseProfileApplicationChange(profileApplicationChange);
- if (result == null) result = caseUMLDiff(profileApplicationChange);
- if (result == null) result = caseDiff(profileApplicationChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(profileApplicationChange);
+ if (result == null)
+ result = caseDiff(profileApplicationChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.DIRECTED_RELATIONSHIP_CHANGE: {
DirectedRelationshipChange directedRelationshipChange = (DirectedRelationshipChange)theEObject;
T result = caseDirectedRelationshipChange(directedRelationshipChange);
- if (result == null) result = caseUMLDiff(directedRelationshipChange);
- if (result == null) result = caseDiff(directedRelationshipChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(directedRelationshipChange);
+ if (result == null)
+ result = caseDiff(directedRelationshipChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.UML_DIFF: {
UMLDiff umlDiff = (UMLDiff)theEObject;
T result = caseUMLDiff(umlDiff);
- if (result == null) result = caseDiff(umlDiff);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseDiff(umlDiff);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.STEREOTYPED_ELEMENT_CHANGE: {
StereotypedElementChange stereotypedElementChange = (StereotypedElementChange)theEObject;
T result = caseStereotypedElementChange(stereotypedElementChange);
- if (result == null) result = caseUMLDiff(stereotypedElementChange);
- if (result == null) result = caseDiff(stereotypedElementChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(stereotypedElementChange);
+ if (result == null)
+ result = caseDiff(stereotypedElementChange);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
case UMLComparePackage.OPAQUE_ELEMENT_BODY_CHANGE: {
OpaqueElementBodyChange opaqueElementBodyChange = (OpaqueElementBodyChange)theEObject;
T result = caseOpaqueElementBodyChange(opaqueElementBodyChange);
- if (result == null) result = caseUMLDiff(opaqueElementBodyChange);
- if (result == null) result = caseDiff(opaqueElementBodyChange);
- if (result == null) result = defaultCase(theEObject);
+ if (result == null)
+ result = caseUMLDiff(opaqueElementBodyChange);
+ if (result == null)
+ result = caseDiff(opaqueElementBodyChange);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
+ case UMLComparePackage.DANGLING_STEREOTYPE_APPLICATION: {
+ DanglingStereotypeApplication danglingStereotypeApplication = (DanglingStereotypeApplication)theEObject;
+ T result = caseDanglingStereotypeApplication(danglingStereotypeApplication);
+ if (result == null)
+ result = caseResourceAttachmentChange(danglingStereotypeApplication);
+ if (result == null)
+ result = caseUMLDiff(danglingStereotypeApplication);
+ if (result == null)
+ result = caseDiff(danglingStereotypeApplication);
+ if (result == null)
+ result = defaultCase(theEObject);
return result;
}
- default: return defaultCase(theEObject);
+ default:
+ return defaultCase(theEObject);
}
}
@@ -390,7 +443,7 @@ public class UMLCompareSwitch<T> {
public T caseStereotypedElementChange(StereotypedElementChange object) {
return null;
}
-
+
/**
* Returns the result of interpreting the object as an instance of '<em>Opaque Element Body Change</em>'.
* <!-- begin-user-doc -->
@@ -407,6 +460,21 @@ public class UMLCompareSwitch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Dangling Stereotype Application</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Dangling Stereotype Application</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseDanglingStereotypeApplication(DanglingStereotypeApplication object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>Diff</em>'.
* <!-- begin-user-doc
* --> This implementation returns null; returning a non-null result will terminate the switch. <!--
@@ -421,6 +489,21 @@ public class UMLCompareSwitch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Resource Attachment Change</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Resource Attachment Change</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseResourceAttachmentChange(ResourceAttachmentChange object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc
* --> This implementation returns null; returning a non-null result will terminate the switch, but this
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java
index 477259558..6190d4abf 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 Obeo.
+ * Copyright (c) 2013, 2015 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.profile.UML
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.stereotype.UMLDanglingStereotypeApplicationFactory;
import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.stereotype.UMLStereotypeApplicationChangeFactory;
import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.stereotype.UMLStereotypeAttributeChangeFactory;
import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.stereotype.UMLStereotypeReferenceChangeFactory;
@@ -65,6 +66,7 @@ public final class UMLExtensionFactoryRegistry {
factories.add(new UMLStereotypeReferenceChangeFactory());
factories.add(new UMLStereotypeApplicationChangeFactory());
factories.add(new UMLOpaqueElementBodyChangeFactory());
+ factories.add(new UMLDanglingStereotypeApplicationFactory());
for (IChangeFactory iDiffExtensionFactory : factories) {
dataset.put(iDiffExtensionFactory.getExtensionKind(), iDiffExtensionFactory);
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLDanglingStereotypeApplicationFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLDanglingStereotypeApplicationFactory.java
new file mode 100644
index 000000000..b153b1b43
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLDanglingStereotypeApplicationFactory.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.stereotype;
+
+import java.util.Set;
+
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.DifferenceKind;
+import org.eclipse.emf.compare.ResourceAttachmentChange;
+import org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication;
+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory;
+import org.eclipse.emf.compare.uml2.internal.postprocessor.util.UMLCompareUtil;
+import org.eclipse.emf.compare.utils.MatchUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * Factory of UML Dangling Stereotype Application extensions.
+ *
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ */
+public class UMLDanglingStereotypeApplicationFactory extends AbstractUMLChangeFactory {
+
+ @Override
+ public boolean handles(Diff input) {
+ return input instanceof ResourceAttachmentChange
+ && UMLCompareUtil.getBaseElement(MatchUtil.getContainer(input.getMatch().getComparison(),
+ input)) == null;
+ }
+
+ @Override
+ public Class<? extends Diff> getExtensionKind() {
+ return DanglingStereotypeApplication.class;
+ }
+
+ @Override
+ public Diff createExtension() {
+ return UMLCompareFactory.eINSTANCE.createDanglingStereotypeApplication();
+ }
+
+ @Override
+ protected boolean isRelatedToAnExtensionAdd(ResourceAttachmentChange input) {
+ return input.getKind() == DifferenceKind.ADD;
+ }
+
+ @Override
+ protected boolean isRelatedToAnExtensionDelete(ResourceAttachmentChange input) {
+ return input.getKind() == DifferenceKind.DELETE;
+ }
+
+ @Override
+ public void setRefiningChanges(Diff extension, DifferenceKind extensionKind, Diff refiningDiff) {
+ extension.getRefinedBy().add(refiningDiff);
+ // Unfortunate, don't know how to set the resourceURI elsewhere than here.
+ if (refiningDiff instanceof ResourceAttachmentChange
+ && extension instanceof DanglingStereotypeApplication) {
+ ((DanglingStereotypeApplication)extension)
+ .setResourceURI(((ResourceAttachmentChange)refiningDiff).getResourceURI());
+ }
+ }
+
+ @Override
+ protected Switch<Set<EObject>> getDiscriminantsGetter() {
+ return null;
+ }
+
+ @Override
+ protected EObject getDiscriminant(Diff input) {
+ return null;
+ }
+
+}

Back to the top