From f7825720f65b8ff9d6af446997b48e747bbebd67 Mon Sep 17 00:00:00 2001 From: Axel Richard Date: Tue, 16 Jun 2015 10:09:39 +0200 Subject: Add new UML DanglingStereotypeApplication concept Change-Id: If8decb2bd5de9f00c65c787b06772cd38bb52ffc Signed-off-by: Axel Richard --- .../TreeNodeCompareInputLabelProvider.java | 8 +- .../ResourceAttachmentChangeMergeViewerItem.java | 5 +- .../META-INF/MANIFEST.MF | 2 +- .../full/obj16/DanglingStereotypeApplication.gif | Bin 0 -> 129 bytes .../plugin.properties | 3 +- plugins/org.eclipse.emf.compare.uml2.edit/pom.xml | 2 +- .../provider/AssociationChangeItemProvider.java | 9 +- .../DanglingStereotypeApplicationItemProvider.java | 161 +++ .../DirectedRelationshipChangeItemProvider.java | 5 +- .../ExecutionSpecificationChangeItemProvider.java | 9 +- .../provider/ExtendChangeItemProvider.java | 9 +- .../GeneralizationSetChangeItemProvider.java | 9 +- .../IntervalConstraintChangeItemProvider.java | 9 +- .../provider/MessageChangeItemProvider.java | 9 +- .../OpaqueElementBodyChangeItemProvider.java | 29 +- .../ProfileApplicationChangeItemProvider.java | 31 +- .../StereotypeApplicationChangeItemProvider.java | 27 +- .../StereotypeAttributeChangeItemProvider.java | 9 +- .../StereotypeReferenceChangeItemProvider.java | 9 +- .../StereotypedElementChangeItemProvider.java | 7 +- .../internal/provider/UMLCompareEditPlugin.java | 8 +- .../UMLCompareItemProviderAdapterFactory.java | 23 + .../internal/provider/UMLDiffItemProvider.java | 52 +- .../uml2/internal/EMFCompareUML2EditMessages.java | 79 ++ .../compare/uml2/internal/edit_messages.properties | 12 + ...ingStereotypeApplicationCustomItemProvider.java | 75 ++ ...UMLCompareCustomItemProviderAdapterFactory.java | 12 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.emf.compare.uml2.rcp.ui/plugin.xml | 4 + .../org.eclipse.emf.compare.uml2.rcp.ui/pom.xml | 2 +- .../UMLDanglingStereotypeApplicationAccessor.java | 71 ++ ...nglingStereotypeApplicationAccessorFactory.java | 69 ++ ...nglingStereotypeApplicationMergeViewerItem.java | 105 ++ .../META-INF/MANIFEST.MF | 2 +- .../model/uml2compare.ecore | 1 + .../model/uml2compare.genmodel | 4 + plugins/org.eclipse.emf.compare.uml2/pom.xml | 2 +- .../compare/uml2/internal/AssociationChange.java | 3 +- .../internal/DanglingStereotypeApplication.java | 26 + .../uml2/internal/DirectedRelationshipChange.java | 3 +- .../internal/ExecutionSpecificationChange.java | 3 +- .../emf/compare/uml2/internal/ExtendChange.java | 3 +- .../uml2/internal/GeneralizationSetChange.java | 3 +- .../uml2/internal/IntervalConstraintChange.java | 3 +- .../emf/compare/uml2/internal/MessageChange.java | 3 +- .../uml2/internal/ProfileApplicationChange.java | 18 +- .../uml2/internal/StereotypeApplicationChange.java | 19 +- .../uml2/internal/StereotypeAttributeChange.java | 3 +- .../uml2/internal/StereotypeReferenceChange.java | 3 +- .../uml2/internal/StereotypedElementChange.java | 3 +- .../compare/uml2/internal/UMLCompareFactory.java | 66 +- .../compare/uml2/internal/UMLComparePackage.java | 1220 +++++++++++--------- .../eclipse/emf/compare/uml2/internal/UMLDiff.java | 24 +- .../impl/DanglingStereotypeApplicationImpl.java | 274 +++++ .../impl/ProfileApplicationChangeImpl.java | 9 +- .../impl/StereotypeApplicationChangeImpl.java | 10 +- .../uml2/internal/impl/UMLCompareFactoryImpl.java | 63 +- .../uml2/internal/impl/UMLComparePackageImpl.java | 148 ++- .../compare/uml2/internal/impl/UMLDiffImpl.java | 18 +- .../internal/util/UMLCompareAdapterFactory.java | 186 +-- .../uml2/internal/util/UMLCompareSwitch.java | 181 ++- .../extension/UMLExtensionFactoryRegistry.java | 4 +- .../UMLDanglingStereotypeApplicationFactory.java | 81 ++ 63 files changed, 2273 insertions(+), 979 deletions(-) create mode 100644 plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DanglingStereotypeApplication.gif create mode 100644 plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DanglingStereotypeApplicationItemProvider.java create mode 100644 plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/EMFCompareUML2EditMessages.java create mode 100644 plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/edit_messages.properties create mode 100644 plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/DanglingStereotypeApplicationCustomItemProvider.java create mode 100644 plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/UMLDanglingStereotypeApplicationAccessor.java create mode 100644 plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/factory/UMLDanglingStereotypeApplicationAccessorFactory.java create mode 100644 plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/mergeviewer/item/impl/DanglingStereotypeApplicationMergeViewerItem.java create mode 100644 plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DanglingStereotypeApplication.java create mode 100644 plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DanglingStereotypeApplicationImpl.java create mode 100644 plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLDanglingStereotypeApplicationFactory.java 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 Binary files /dev/null and b/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DanglingStereotypeApplication.gif 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 @@ org.eclipse.emf.compare org.eclipse.emf.compare.uml2.edit - 2.3.0-SNAPSHOT + 2.4.0-SNAPSHOT eclipse-plugin 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; * * @generated */ -public class AssociationChangeItemProvider - extends UMLDiffItemProvider { +public class AssociationChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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. + * + * + * @generated + */ +public class DanglingStereotypeApplicationItemProvider extends ResourceAttachmentChangeItemProvider { + /** + * This constructs an instance from a factory and a notifier. + * + * + * @generated + */ + public DanglingStereotypeApplicationItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * + * + * @generated + */ + @Override + public List getPropertyDescriptors(Object object) { + if (itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + addDiscriminantPropertyDescriptor(object); + addEReferencePropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Discriminant feature. + * + * + * @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. + * + * + * @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. + * + * + * @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. + * + * + * @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}. + * + * + * @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. + * + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. + * + * + * @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; * * @generated */ -public class ExecutionSpecificationChangeItemProvider - extends UMLDiffItemProvider { +public class ExecutionSpecificationChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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; * * @generated */ -public class ExtendChangeItemProvider - extends UMLDiffItemProvider { +public class ExtendChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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; * * @generated */ -public class GeneralizationSetChangeItemProvider - extends UMLDiffItemProvider { +public class GeneralizationSetChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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; * * @generated */ -public class IntervalConstraintChangeItemProvider - extends UMLDiffItemProvider { +public class IntervalConstraintChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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; * * @generated */ -public class MessageChangeItemProvider - extends UMLDiffItemProvider { +public class MessageChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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. - * * @generated */ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider { @@ -58,8 +57,8 @@ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider { } /** - * This adds a property descriptor for the Language feature. - * + * This adds a property descriptor for the Language feature. + * * @generated */ protected void addLanguagePropertyDescriptor(Object object) { @@ -75,8 +74,8 @@ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider { } /** - * This returns OpaqueElementBodyChange.gif. - * + * This returns OpaqueElementBodyChange.gif. + * * @generated */ @Override @@ -85,8 +84,8 @@ public class OpaqueElementBodyChangeItemProvider extends UMLDiffItemProvider { } /** - * This returns the label text for the adapted class. - * + * This returns the label text for the adapted class. + * * @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}. - * * @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. - * + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * * @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; * * @generated */ -public class ProfileApplicationChangeItemProvider - extends UMLDiffItemProvider { +public class ProfileApplicationChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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; * * @generated */ -public class StereotypeAttributeChangeItemProvider - extends UMLDiffItemProvider { +public class StereotypeAttributeChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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; * * @generated */ -public class StereotypeReferenceChangeItemProvider - extends UMLDiffItemProvider { +public class StereotypeReferenceChangeItemProvider extends UMLDiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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 @@ -237,6 +237,29 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto return opaqueElementBodyChangeItemProvider; } + /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication} instances. + * + * + * @generated + */ + protected DanglingStereotypeApplicationItemProvider danglingStereotypeApplicationItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication}. + * + * + * @generated + */ + @Override + public Adapter createDanglingStereotypeApplicationAdapter() { + if (danglingStereotypeApplicationItemProvider == null) { + danglingStereotypeApplicationItemProvider = new DanglingStereotypeApplicationItemProvider(this); + } + + return danglingStereotypeApplicationItemProvider; + } + /** * This returns the root adapter factory that contains this factory. * * @generated */ -public class UMLDiffItemProvider - extends DiffItemProvider { +public class UMLDiffItemProvider extends DiffItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -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 Axel Richard + */ +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 key. + */ + 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 Axel Richard + */ +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 @@ -116,6 +116,16 @@ public class UMLCompareCustomItemProviderAdapterFactory extends UMLCompareAdapte return new OpaqueElementBodyChangeCustomItemProvider(this); } + /** + * {@inheritDoc} + * + * @see UMLCompareAdapterFactory#createDanglingStereotypeApplicationAdapter() + */ + @Override + public Adapter createDanglingStereotypeApplicationAdapter() { + return new DanglingStereotypeApplicationCustomItemProvider(this); + } + /** * {@inheritDoc} * 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"> + + 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 @@ org.eclipse.emf.compare org.eclipse.emf.compare.uml2.rcp.ui - 2.3.0-SNAPSHOT + 2.4.0-SNAPSHOT eclipse-plugin 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 Axel Richard + * @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 getItems() { + final ImmutableList 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 Axel Richard + * @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 Axel Richard + * @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 @@ + 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 @@ + + + + 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 @@ org.eclipse.emf.compare org.eclipse.emf.compare.uml2 - 2.3.0-SNAPSHOT + 2.4.0-SNAPSHOT eclipse-plugin 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; /** * A representation of the model object 'Association Change'. - * + * + * * @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; + +/** + * + * A representation of the model object 'Dangling Stereotype Application'. + * + * + * + * @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; /** * A representation of the model object 'Directed Relationship Change * '. - * + * + * * @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; /** * A representation of the model object ' * Execution Specification Change'. - * + * + * * @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; /** * A representation of the model object 'Extend Change'. - * + * + * * @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; /** * A representation of the model object 'Generalization Set Change'. * - * + * + * * @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; /** * A representation of the model object 'Interval Constraint Change'. * - * + * + * * @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; /** * A representation of the model object 'Message Change'. - * + * + * * @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; /** * A representation of the model object 'Profile Application Change'. * + * *

* The following features are supported: *

    - *
  • {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile Profile}
    • + *
  • {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile Profile}
    • *
*

- * + * * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getProfileApplicationChange() * @model * @generated */ public interface ProfileApplicationChange extends UMLDiff { /** - * Returns the value of the 'Profile' reference. + * Returns the value of the 'Profile' reference. + * *

* If the meaning of the 'Profile' reference isn't clear, there really should be more of a * description here... *

* - * * @return the value of the 'Profile' 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 Profile}' - * reference. - * - * @param value - * the new value of the 'Profile' reference. + * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile Profile}' reference. + * + * @param value the new value of the 'Profile' 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; /** * A representation of the model object 'Stereotype Application Change * '. + * *

* The following features are supported: *

    - *
  • {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange#getStereotype Stereotype - * }
    • + *
  • {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange#getStereotype Stereotype}
    • *
*

- * + * * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypeApplicationChange() * @model * @generated */ public interface StereotypeApplicationChange extends UMLDiff { /** - * Returns the value of the 'Stereotype' reference. + * Returns the value of the 'Stereotype' reference. + * *

* If the meaning of the 'Stereotype' reference isn't clear, there really should be more of a * description here... *

* - * * @return the value of the 'Stereotype' 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 - * Stereotype}' reference. - * - * @param value - * the new value of the 'Stereotype' reference. + * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange#getStereotype Stereotype}' reference. + * + * @param value the new value of the 'Stereotype' 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; /** * A representation of the model object 'Stereotype Attribute Change'. * - * + * + * * @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; /** * A representation of the model object 'Stereotype Reference Change'. * - * + * + * * @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; /** * A representation of the model object 'Stereotyped Element Change'. * - * + * + * * @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; /** * The Factory for the model. It provides a create method for each non-abstract * class of the model. - * * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage * @generated */ public interface UMLCompareFactory extends EFactory { /** - * The singleton instance of the factory. - * + * The singleton instance of the factory. + * * @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 'Extend Change'. - * + * Returns a new object of class 'Extend Change'. + * * @return a new object of class 'Extend Change'. * @generated */ ExtendChange createExtendChange(); /** - * Returns a new object of class 'Generalization Set Change'. - * * @return a new object of class 'Generalization Set Change'. * @generated */ GeneralizationSetChange createGeneralizationSetChange(); /** - * Returns a new object of class 'Execution Specification Change'. - * * @return a new object of class 'Execution Specification Change'. * @generated */ ExecutionSpecificationChange createExecutionSpecificationChange(); /** - * Returns a new object of class 'Interval Constraint Change'. - * * @return a new object of class 'Interval Constraint Change'. * @generated */ IntervalConstraintChange createIntervalConstraintChange(); /** - * Returns a new object of class 'Message Change'. - * + * Returns a new object of class 'Message Change'. + * * @return a new object of class 'Message Change'. * @generated */ MessageChange createMessageChange(); /** - * Returns a new object of class 'Stereotype Attribute Change'. - * * @return a new object of class 'Stereotype Attribute Change'. * @generated */ StereotypeAttributeChange createStereotypeAttributeChange(); /** - * Returns a new object of class 'Stereotype Application Change'. - * * @return a new object of class 'Stereotype Application Change'. * @generated */ StereotypeApplicationChange createStereotypeApplicationChange(); /** - * Returns a new object of class 'Stereotype Reference Change'. - * * @return a new object of class 'Stereotype Reference Change'. * @generated */ StereotypeReferenceChange createStereotypeReferenceChange(); /** - * Returns a new object of class 'Profile Application Change'. - * * @return a new object of class 'Profile Application Change'. * @generated */ ProfileApplicationChange createProfileApplicationChange(); /** - * Returns a new object of class 'Directed Relationship Change'. - * * @return a new object of class 'Directed Relationship Change'. * @generated */ DirectedRelationshipChange createDirectedRelationshipChange(); /** - * Returns a new object of class 'Stereotyped Element Change'. - * * @return a new object of class 'Stereotyped Element Change'. * @generated */ StereotypedElementChange createStereotypedElementChange(); /** - * Returns a new object of class 'Opaque Element Body Change'. - * * @return a new object of class 'Opaque Element Body Change'. * @generated */ OpaqueElementBodyChange createOpaqueElementBodyChange(); /** - * Returns the package supported by this factory. - * + * Returns a new object of class 'Dangling Stereotype Application'. + * + * + * @return a new object of class 'Dangling Stereotype Application'. + * @generated + */ + DanglingStereotypeApplication createDanglingStereotypeApplication(); + + /** + * Returns the package supported by this factory. + * * @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; *
  • and each data type
    • * * - * * @see org.eclipse.emf.compare.uml2.internal.UMLCompareFactory * @model kind="package" * @generated */ public interface UMLComparePackage extends EPackage { /** - * The package name. - * + * The package name. + * * @generated */ String eNAME = "uml2"; //$NON-NLS-1$ /** - * The package namespace URI. - * + * The package namespace URI. + * * @generated */ String eNS_URI = "http://www.eclipse.org/emf/compare/uml2/2.0"; //$NON-NLS-1$ /** - * The package namespace name. - * + * The package namespace name. + * * @generated */ String eNS_PREFIX = "umlcompare"; //$NON-NLS-1$ /** - * The singleton instance of the package. - * + * The singleton instance of the package. + * * @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 - * UML Diff}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl UML Diff}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int UML_DIFF__MATCH = ComparePackage.DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int UML_DIFF__REQUIRES = ComparePackage.DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int UML_DIFF__REQUIRED_BY = ComparePackage.DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int UML_DIFF__IMPLIES = ComparePackage.DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int UML_DIFF__IMPLIED_BY = ComparePackage.DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int UML_DIFF__REFINES = ComparePackage.DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int UML_DIFF__REFINED_BY = ComparePackage.DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int UML_DIFF__PRIME_REFINING = ComparePackage.DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -160,17 +158,17 @@ public interface UMLComparePackage extends EPackage { int UML_DIFF__SOURCE = ComparePackage.DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int UML_DIFF__STATE = ComparePackage.DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -186,36 +184,35 @@ public interface UMLComparePackage extends EPackage { int UML_DIFF__CONFLICT = ComparePackage.DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int UML_DIFF__DISCRIMINANT = ComparePackage.DIFF_FEATURE_COUNT + 0; /** - * The feature id for the 'EReference' reference. - * * @generated * @ordered */ int UML_DIFF__EREFERENCE = ComparePackage.DIFF_FEATURE_COUNT + 1; /** - * The number of structural features of the 'UML Diff' class. - * * @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 - * Association Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl Association Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -312,17 +309,17 @@ public interface UMLComparePackage extends EPackage { int ASSOCIATION_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int ASSOCIATION_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -338,36 +335,35 @@ public interface UMLComparePackage extends EPackage { int ASSOCIATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @generated * @ordered */ int ASSOCIATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Association Change' class. + * The number of structural features of the 'Association Change' class. + * * - * * @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 - * Extend Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl Extend Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int EXTEND_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int EXTEND_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int EXTEND_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int EXTEND_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int EXTEND_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int EXTEND_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int EXTEND_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int EXTEND_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -464,17 +460,17 @@ public interface UMLComparePackage extends EPackage { int EXTEND_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int EXTEND_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -490,37 +486,35 @@ public interface UMLComparePackage extends EPackage { int EXTEND_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int EXTEND_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @generated * @ordered */ int EXTEND_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Extend Change' class. - * * @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 - * Generalization Set Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.GeneralizationSetChangeImpl Generalization Set Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -617,17 +611,17 @@ public interface UMLComparePackage extends EPackage { int GENERALIZATION_SET_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -643,18 +637,18 @@ public interface UMLComparePackage extends EPackage { int GENERALIZATION_SET_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Execution Specification Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExecutionSpecificationChangeImpl Execution Specification Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -770,17 +762,17 @@ public interface UMLComparePackage extends EPackage { int EXECUTION_SPECIFICATION_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -796,18 +788,18 @@ public interface UMLComparePackage extends EPackage { int EXECUTION_SPECIFICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Interval Constraint Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.IntervalConstraintChangeImpl Interval Constraint Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -923,17 +913,17 @@ public interface UMLComparePackage extends EPackage { int INTERVAL_CONSTRAINT_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -949,18 +939,18 @@ public interface UMLComparePackage extends EPackage { int INTERVAL_CONSTRAINT_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Message Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.MessageChangeImpl Message Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int MESSAGE_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int MESSAGE_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int MESSAGE_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int MESSAGE_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int MESSAGE_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int MESSAGE_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int MESSAGE_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int MESSAGE_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -1075,17 +1064,17 @@ public interface UMLComparePackage extends EPackage { int MESSAGE_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int MESSAGE_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -1101,37 +1090,35 @@ public interface UMLComparePackage extends EPackage { int MESSAGE_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int MESSAGE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @generated * @ordered */ int MESSAGE_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Message Change' class. - * * @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 - * Stereotype Attribute Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeAttributeChangeImpl Stereotype Attribute Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -1228,17 +1215,17 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_ATTRIBUTE_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -1254,18 +1241,18 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_ATTRIBUTE_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Stereotype Application Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeApplicationChangeImpl Stereotype Application Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -1381,17 +1366,17 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_APPLICATION_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -1407,27 +1392,27 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_APPLICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The feature id for the 'Stereotype' reference. - * * @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 - * Stereotype Reference Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeReferenceChangeImpl Stereotype Reference Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -1543,17 +1526,17 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_REFERENCE_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -1569,18 +1552,18 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_REFERENCE_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Profile Application Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ProfileApplicationChangeImpl Profile Application Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -1696,17 +1677,17 @@ public interface UMLComparePackage extends EPackage { int PROFILE_APPLICATION_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -1722,18 +1703,18 @@ public interface UMLComparePackage extends EPackage { int PROFILE_APPLICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Directed Relationship Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl Directed Relationship Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -1858,17 +1837,17 @@ public interface UMLComparePackage extends EPackage { int DIRECTED_RELATIONSHIP_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -1884,18 +1863,18 @@ public interface UMLComparePackage extends EPackage { int DIRECTED_RELATIONSHIP_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Stereotyped Element Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl Stereotyped Element Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @generated * @ordered */ @@ -2011,17 +1988,17 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPED_ELEMENT_CHANGE__SOURCE = UML_DIFF__SOURCE; /** - * The feature id for the 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @generated * @ordered */ @@ -2037,18 +2014,18 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPED_ELEMENT_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * * @generated * @ordered */ int STEREOTYPED_ELEMENT_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Opaque Element Body Change}' class. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.OpaqueElementBodyChangeImpl Opaque Element Body Change}' class. + * * @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 'Match' container reference. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__MATCH = UML_DIFF__MATCH; /** - * The feature id for the 'Requires' reference list. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__REQUIRES = UML_DIFF__REQUIRES; /** - * The feature id for the 'Required By' reference list. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY; /** - * The feature id for the 'Implies' reference list. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__IMPLIES = UML_DIFF__IMPLIES; /** - * The feature id for the 'Implied By' reference list. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__IMPLIED_BY = UML_DIFF__IMPLIED_BY; /** - * The feature id for the 'Refines' reference list. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__REFINES = UML_DIFF__REFINES; /** - * The feature id for the 'Refined By' reference list. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY; /** - * The feature id for the 'Prime Refining' reference. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__PRIME_REFINING = UML_DIFF__PRIME_REFINING; /** - * The feature id for the 'Kind' attribute. - * + * The feature id for the 'Kind' attribute. + * * @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 'State' attribute. - * + * The feature id for the 'State' attribute. + * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__STATE = UML_DIFF__STATE; /** - * The feature id for the 'Equivalence' reference. - * * @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 'Discriminant' reference. - * * @generated * @ordered */ int OPAQUE_ELEMENT_BODY_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * * @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 - * Association Change}'. - * + * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl Dangling Stereotype Application}' class. + * + * + * @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 'Match' reference. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__MATCH = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__MATCH; + + /** + * The feature id for the 'Requires' reference list. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__REQUIRES = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__REQUIRES; + + /** + * The feature id for the 'Required By' reference list. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__REQUIRED_BY = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__REQUIRED_BY; + + /** + * The feature id for the 'Implies' reference list. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__IMPLIES = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__IMPLIES; + + /** + * The feature id for the 'Implied By' reference list. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__IMPLIED_BY = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__IMPLIED_BY; + + /** + * The feature id for the 'Refines' reference list. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__REFINES = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__REFINES; + + /** + * The feature id for the 'Refined By' reference list. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__REFINED_BY = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__REFINED_BY; + + /** + * The feature id for the 'Prime Refining' reference. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__PRIME_REFINING = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__PRIME_REFINING; + + /** + * The feature id for the 'Kind' attribute. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__KIND = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__KIND; + + /** + * The feature id for the 'Source' attribute. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__SOURCE = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__SOURCE; + + /** + * The feature id for the 'State' attribute. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__STATE = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__STATE; + + /** + * The feature id for the 'Equivalence' reference. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__EQUIVALENCE = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__EQUIVALENCE; + + /** + * The feature id for the 'Conflict' reference. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__CONFLICT = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__CONFLICT; + + /** + * The feature id for the 'Resource URI' attribute. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__RESOURCE_URI = ComparePackage.RESOURCE_ATTACHMENT_CHANGE__RESOURCE_URI; + + /** + * The feature id for the 'Discriminant' reference. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__DISCRIMINANT = ComparePackage.RESOURCE_ATTACHMENT_CHANGE_FEATURE_COUNT + 0; + + /** + * The feature id for the 'EReference' reference. + * + * + * @generated + * @ordered + */ + int DANGLING_STEREOTYPE_APPLICATION__EREFERENCE = ComparePackage.RESOURCE_ATTACHMENT_CHANGE_FEATURE_COUNT + 1; + + /** + * The number of structural features of the 'Dangling Stereotype Application' class. + * + * + * @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 Association Change}'. + * * @return the meta object for class 'Association Change'. * @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 - * Extend Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.ExtendChange Extend Change}'. + * * @return the meta object for class 'Extend Change'. * @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 - * Generalization Set Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange Generalization Set Change}'. + * * @return the meta object for class 'Generalization Set Change'. * @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 - * Execution Specification Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange Execution Specification Change}'. + * * @return the meta object for class 'Execution Specification Change'. * @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 - * Interval Constraint Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange Interval Constraint Change}'. + * * @return the meta object for class 'Interval Constraint Change'. * @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 - * Message Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.MessageChange Message Change}'. + * * @return the meta object for class 'Message Change'. * @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 - * Stereotype Attribute Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeAttributeChange Stereotype Attribute Change}'. + * * @return the meta object for class 'Stereotype Attribute Change'. * @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 - * Stereotype Application Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange Stereotype Application Change}'. + * * @return the meta object for class 'Stereotype Application Change'. * @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 - * Stereotype}'. - * + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange#getStereotype Stereotype}'. + * * @return the meta object for the reference 'Stereotype'. * @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 - * Stereotype Reference Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange Stereotype Reference Change}'. + * * @return the meta object for class 'Stereotype Reference Change'. * @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 - * Profile Application Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange Profile Application Change}'. + * * @return the meta object for class 'Profile Application Change'. * @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 Profile}'. + * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange#getProfile Profile}'. * - * * @return the meta object for the reference 'Profile'. * @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 - * Directed Relationship Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange Directed Relationship Change}'. + * * @return the meta object for class 'Directed Relationship Change'. * @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 - * UML Diff}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff UML Diff}'. + * * @return the meta object for class 'UML Diff'. * @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 - * Stereotyped Element Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.StereotypedElementChange Stereotyped Element Change}'. + * * @return the meta object for class 'Stereotyped Element Change'. * @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 - * Opaque Element Body Change}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange Opaque Element Body Change}'. + * * @return the meta object for class 'Opaque Element Body Change'. * @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 Language}'. + * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange#getLanguage Language}'. * - * * @return the meta object for the attribute 'Language'. * @see org.eclipse.emf.compare.uml2.internal.OpaqueElementBodyChange#getLanguage() * @see #getOpaqueElementBodyChange() @@ -2435,6 +2543,16 @@ public interface UMLComparePackage extends EPackage { */ EAttribute getOpaqueElementBodyChange_Language(); + /** + * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication Dangling Stereotype Application}'. + * + * + * @return the meta object for class 'Dangling Stereotype Application'. + * @see org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication + * @generated + */ + EClass getDanglingStereotypeApplication(); + /** * Returns the factory that creates the instances of the model. @@ -2453,17 +2571,14 @@ public interface UMLComparePackage extends EPackage { *
  • and each data type
    • * * - * * @generated */ @SuppressWarnings("hiding") // generated code, removing warnings interface Literals { /** - * The meta object literal for the ' - * {@link org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl - * Association Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.AssociationChangeImpl Association Change}' class. + * * @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 Extend Change}' class. + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl Extend Change}' class. * - * * @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 - * Generalization Set Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.GeneralizationSetChangeImpl Generalization Set Change}' class. + * * @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 - * Execution Specification Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExecutionSpecificationChangeImpl Execution Specification Change}' class. + * * @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 - * Interval Constraint Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.IntervalConstraintChangeImpl Interval Constraint Change}' class. + * * @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 Message Change}' - * class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.MessageChangeImpl Message Change}' class. + * * @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 - * Stereotype Attribute Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeAttributeChangeImpl Stereotype Attribute Change}' class. + * * @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 - * Stereotype Application Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeApplicationChangeImpl Stereotype Application Change}' class. + * * @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 'Stereotype' reference feature. - * * @generated */ EReference STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE = eINSTANCE .getStereotypeApplicationChange_Stereotype(); /** - * The meta object literal for the ' - * {@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeReferenceChangeImpl - * Stereotype Reference Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypeReferenceChangeImpl Stereotype Reference Change}' class. + * * @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 - * Profile Application Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ProfileApplicationChangeImpl Profile Application Change}' class. + * * @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 'Profile' reference feature. - * * @generated */ EReference PROFILE_APPLICATION_CHANGE__PROFILE = eINSTANCE.getProfileApplicationChange_Profile(); /** - * The meta object literal for the ' - * {@link org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl - * Directed Relationship Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl Directed Relationship Change}' class. + * * @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 - * UML Diff}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl UML Diff}' class. + * * @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 'EReference' reference feature. - * * @generated */ EReference UML_DIFF__EREFERENCE = eINSTANCE.getUMLDiff_EReference(); /** - * The meta object literal for the ' - * {@link org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl - * Stereotyped Element Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl Stereotyped Element Change}' class. + * * @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 - * Opaque Element Body Change}' class. - * + * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.OpaqueElementBodyChangeImpl Opaque Element Body Change}' class. + * * @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 'Language' attribute feature. - * * @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 Dangling Stereotype Application}' class. + * + * + * @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 'Discriminant' reference. + * Returns the value of the 'Discriminant' reference. + * *

    * If the meaning of the 'Discriminant' reference isn't clear, there really should be more of a * description here... *

    * - * * @return the value of the 'Discriminant' 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 - * Discriminant}' reference. - * - * @param value - * the new value of the 'Discriminant' reference. + * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getDiscriminant Discriminant}' reference. + * + * @param value the new value of the 'Discriminant' reference. * @see #getDiscriminant() * @generated */ void setDiscriminant(EObject value); /** - * Returns the value of the 'EReference' reference. + * Returns the value of the 'EReference' reference. + * *

    * If the meaning of the 'EReference' reference isn't clear, there really should be more of a * description here... *

    * - * * @return the value of the 'EReference' 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 - * EReference}' reference. - * - * @param value - * the new value of the 'EReference' reference. + * Sets the value of the '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getEReference EReference}' reference. + * + * @param value the new value of the 'EReference' 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; + +/** + * + * An implementation of the model object 'Dangling Stereotype Application'. + * + *

    + * The following features are implemented: + *

      + *
    • {@link org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl#getDiscriminant Discriminant}
      • + *
    • {@link org.eclipse.emf.compare.uml2.internal.impl.DanglingStereotypeApplicationImpl#getEReference EReference}
      • + *
    + *

    + * + * @generated + */ +public class DanglingStereotypeApplicationImpl extends ResourceAttachmentChangeSpec implements DanglingStereotypeApplication { + /** + * The cached value of the '{@link #getDiscriminant() Discriminant}' reference. + * + * + * @see #getDiscriminant() + * @generated + * @ordered + */ + protected EObject discriminant; + + /** + * The cached value of the '{@link #getEReference() EReference}' reference. + * + * + * @see #getEReference() + * @generated + * @ordered + */ + protected EReference eReference; + + /** + * + * + * @generated + */ + protected DanglingStereotypeApplicationImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return UMLComparePackage.Literals.DANGLING_STEREOTYPE_APPLICATION; + } + + /** + * + * + * @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; + } + + /** + * + * + * @generated + */ + public EObject basicGetDiscriminant() { + return discriminant; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @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; + } + + /** + * + * + * @generated + */ + public EReference basicGetEReference() { + return eReference; + } + + /** + * + * + * @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)); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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; } - + /** * * @@ -206,6 +223,16 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac return opaqueElementBodyChange; } + /** + * + * + * @generated + */ + public DanglingStereotypeApplication createDanglingStereotypeApplication() { + DanglingStereotypeApplicationImpl danglingStereotypeApplication = new DanglingStereotypeApplicationImpl(); + return danglingStereotypeApplication; + } + /** * * @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; - + /** * * @@ -127,6 +128,13 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac */ private EClass opaqueElementBodyChangeEClass = null; + /** + * + * + * @generated + */ + private EClass danglingStereotypeApplicationEClass = null; + /** * Creates an instance of the model Package, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package @@ -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; } - + /** * * @@ -345,6 +355,15 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac return (EAttribute)opaqueElementBodyChangeEClass.getEStructuralFeatures().get(0); } + /** + * + * + * @generated + */ + public EClass getDanglingStereotypeApplication() { + return danglingStereotypeApplicationEClass; + } + /** * * @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 modelSwitch = new UMLCompareSwitch() { - @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 target. @@ -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 Opaque Element Body Change}'. * @@ -332,6 +358,20 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { return null; } + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.DanglingStereotypeApplication Dangling Stereotype Application}'. + * + * 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. + * + * @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 Diff}'. This default implementation returns null so that we can easily ignore cases; it's @@ -345,6 +385,20 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { return null; } + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.ResourceAttachmentChange Resource Attachment Change}'. + * + * 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. + * + * @return the new adapter. + * @see org.eclipse.emf.compare.ResourceAttachmentChange + * @generated + */ + public Adapter createResourceAttachmentChangeAdapter() { + return null; + } + /** * Creates a new adapter for the default case. * This default implementation returns 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 { protected T doSwitch(EClass theEClass, EObject theEObject) { if (theEClass.eContainer() == modelPackage) { return doSwitch(theEClass.getClassifierID(), theEObject); - } - else { + } else { List 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 { 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 { public T caseStereotypedElementChange(StereotypedElementChange object) { return null; } - + /** * Returns the result of interpreting the object as an instance of 'Opaque Element Body Change'. * @@ -406,6 +459,21 @@ public class UMLCompareSwitch { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Dangling Stereotype Application'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Dangling Stereotype Application'. + * @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 'Diff'. * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Resource Attachment Change'. + * @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 'EObject'. *