From b1b44d5068643c8ba95fa4a165521cb44b37f7fc Mon Sep 17 00:00:00 2001 From: Arthur Daussy Date: Tue, 17 Jun 2014 10:36:47 +0200 Subject: [PATCH] Add Stereotyped element change to the UML Compare meta model. Add "StereotypedElementChange" to the UML Compare meta model. Create a first custom implementation of its item provider. Format all generated code (subsequent generations will automatically format the code). Change-Id: I4285a9f5216bcf5c7b30cb2d3156e2cb2c0a7260 Signed-off-by: Arthur Daussy --- .../META-INF/MANIFEST.MF | 1 + .../icons/full/obj16/StereotypedElementChange.gif | Bin 0 -> 129 bytes .../plugin.properties | 2 + .../StereotypedElementChangeItemProvider.java | 107 ++ .../UMLCompareItemProviderAdapterFactory.java | 26 +- ...StereotypedElementChangeCustomItemProvider.java | 103 ++ ...UMLCompareCustomItemProviderAdapterFactory.java | 17 +- .../model/uml2compare.ecore | 1 + .../model/uml2compare.genmodel | 3 +- .../compare/uml2/internal/AssociationChange.java | 9 +- .../uml2/internal/DirectedRelationshipChange.java | 9 +- .../internal/ExecutionSpecificationChange.java | 9 +- .../emf/compare/uml2/internal/ExtendChange.java | 9 +- .../uml2/internal/GeneralizationSetChange.java | 7 +- .../uml2/internal/IntervalConstraintChange.java | 7 +- .../emf/compare/uml2/internal/MessageChange.java | 9 +- .../uml2/internal/ProfileApplicationChange.java | 26 +- .../uml2/internal/StereotypeApplicationChange.java | 29 +- .../uml2/internal/StereotypeAttributeChange.java | 7 +- .../uml2/internal/StereotypeReferenceChange.java | 7 +- ...onChange.java => StereotypedElementChange.java} | 15 +- .../compare/uml2/internal/UMLCompareFactory.java | 94 +- .../compare/uml2/internal/UMLComparePackage.java | 1665 +++++++++++--------- .../eclipse/emf/compare/uml2/internal/UMLDiff.java | 46 +- .../impl/StereotypedElementChangeImpl.java | 46 + .../uml2/internal/impl/UMLCompareFactoryImpl.java | 14 +- .../uml2/internal/impl/UMLComparePackageImpl.java | 24 +- .../internal/util/UMLCompareAdapterFactory.java | 20 +- .../uml2/internal/util/UMLCompareSwitch.java | 24 + 29 files changed, 1431 insertions(+), 905 deletions(-) create mode 100644 plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/StereotypedElementChange.gif create mode 100644 plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypedElementChangeItemProvider.java create mode 100644 plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/StereotypedElementChangeCustomItemProvider.java copy plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/{AssociationChange.java => StereotypedElementChange.java} (65%) create mode 100644 plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypedElementChangeImpl.java 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 898804cf4..31d690108 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 @@ -20,6 +20,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.compare.edit Bundle-ActivationPolicy: lazy Import-Package: com.google.common.base;version="[11.0.0,16.0.0)", + com.google.common.collect;version="[11.0.0,16.0.0)", org.eclipse.emf.compare.provider Export-Package: org.eclipse.emf.compare.uml2.internal.provider;x-internal:=true, org.eclipse.emf.compare.uml2.internal.provider.custom;x-friends:="org.eclipse.emf.compare.diagram.papyrus.tests", diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/StereotypedElementChange.gif b/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/StereotypedElementChange.gif new file mode 100644 index 0000000000000000000000000000000000000000..53500daf98e17bc98acd04b14eb7b16938ceb4dd GIT binary patch literal 129 zcwTe&bhEHb6krfw*vtS14Pe~RaNxj!hK2@)|3L14Ap8G+FzY{vJ!j6GOP4Ag92^vX zvM@3*a5CtCG=j`vV9_%;>A8BZ#p^HMRQMkjx^6dRy_J&SwP4{_8@-Ry)UKM9_pH?9 R*Imxo>2_qIkT4^IH2}wzFZ%!h literal 0 HcwPel00001 diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties index 32b12ea2b..cfcc810e8 100644 --- a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties +++ b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties @@ -162,3 +162,5 @@ _UI_IncludeChange_type = Include Change _UI_UMLDiff_eReference_feature = EReference _UI_DirectedRelationshipChange_type = Directed Relationship Change _UI_StereotypeAttributeChange_type = Stereotype Attribute Change +_UI_StereotypedElementChange_type = Stereotyped Element Change +_UI_StereotypedElementChange_stereotypeApplications_feature = Stereotype Applications 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 new file mode 100644 index 000000000..016cc6acc --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/StereotypedElementChangeItemProvider.java @@ -0,0 +1,107 @@ +/** + * Copyright (c) 2014 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + */ +package org.eclipse.emf.compare.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.compare.DifferenceKind; +import org.eclipse.emf.compare.uml2.internal.StereotypedElementChange; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypedElementChange} object. + * + * + * @generated + */ +public class StereotypedElementChangeItemProvider extends UMLDiffItemProvider { + /** + * This constructs an instance from a factory and a notifier. + * + * + * @generated + */ + public StereotypedElementChangeItemProvider(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); + + } + return itemPropertyDescriptors; + } + + /** + * This returns StereotypedElementChange.gif. + * + * + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/StereotypedElementChange")); //$NON-NLS-1$ + } + + /** + * This returns the label text for the adapted class. + * + * + * @generated + */ + @Override + 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$ + } + + + /** + * 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); + } + +} 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 f98d32180..eced77e52 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 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -329,6 +329,29 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto } /** + * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.StereotypedElementChange} instances. + * + * + * @generated + */ + protected StereotypedElementChangeItemProvider stereotypedElementChangeItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypedElementChange}. + * + * + * @generated + */ + @Override + public Adapter createStereotypedElementChangeAdapter() { + if (stereotypedElementChangeItemProvider == null) { + stereotypedElementChangeItemProvider = new StereotypedElementChangeItemProvider(this); + } + + return stereotypedElementChangeItemProvider; + } + + /** * This returns the root adapter factory that contains this factory. * @@ -434,6 +457,7 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto if (stereotypeReferenceChangeItemProvider != null) stereotypeReferenceChangeItemProvider.dispose(); if (profileApplicationChangeItemProvider != null) profileApplicationChangeItemProvider.dispose(); if (directedRelationshipChangeItemProvider != null) directedRelationshipChangeItemProvider.dispose(); + if (stereotypedElementChangeItemProvider != null) stereotypedElementChangeItemProvider.dispose(); } } diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/StereotypedElementChangeCustomItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/StereotypedElementChangeCustomItemProvider.java new file mode 100644 index 000000000..c47cf902e --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/StereotypedElementChangeCustomItemProvider.java @@ -0,0 +1,103 @@ +/** + * Copyright (c) 2014 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + */ +package org.eclipse.emf.compare.uml2.internal.provider.custom; + +import com.google.common.base.Function; +import com.google.common.base.Joiner; +import com.google.common.collect.Iterables; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.compare.DifferenceKind; +import org.eclipse.emf.compare.provider.ExtendedAdapterFactoryItemDelegator; +import org.eclipse.emf.compare.provider.utils.ComposedStyledString; +import org.eclipse.emf.compare.provider.utils.IStyledString; +import org.eclipse.emf.compare.provider.utils.IStyledString.Style; +import org.eclipse.emf.compare.uml2.internal.StereotypedElementChange; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.uml2.uml.Element; +import org.eclipse.uml2.uml.NamedElement; +import org.eclipse.uml2.uml.Stereotype; + +/* + * TODO: Improve label and Implement getImage. + */ +/** + * Custom item provider for {@link StereotypedElementChange}. + * + * @author Arthur Daussy + */ + +public class StereotypedElementChangeCustomItemProvider extends UMLDiffCustomItemProvider { + + /** + * Transform a {@link Stereotype} into its name. + */ + private static final Function TO_STEREOTYPE_NAME = new Function() { + + public String apply(Stereotype input) { + return input.getName(); + } + }; + + /** + * Item delegator. + */ + private final ExtendedAdapterFactoryItemDelegator itemDelegator; + + /** + * Constructor. + * + * @param adapterFactory + * the adapter factory to use. + */ + public StereotypedElementChangeCustomItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + itemDelegator = new ExtendedAdapterFactoryItemDelegator(getRootAdapterFactory()); + } + + @Override + public IStyledString.IComposedStyledString getStyledText(Object object) { + final StereotypedElementChange stereotypedElementChange = (StereotypedElementChange)object; + + EObject base = stereotypedElementChange.getDiscriminant(); + if (!(base instanceof Element)) { + throw new RuntimeException("The discrimant of a StereotypedElementChange should be a uml Element"); //$NON-NLS-1$ + } + final String sterotypesNames = Joiner.on(", ").join(//$NON-NLS-1$ + Iterables.transform(((Element)base).getAppliedStereotypes(), TO_STEREOTYPE_NAME)); + final ComposedStyledString stereotypeText = new ComposedStyledString(); + stereotypeText.append("<").append(sterotypesNames).append("> "); //$NON-NLS-1$ //$NON-NLS-2$ + + if (base instanceof NamedElement) { + stereotypeText.append(((NamedElement)base).getName()); + } else { + // Can't really do more + stereotypeText.append(itemDelegator.getText(base)); + } + + final String action; + switch (stereotypedElementChange.getKind()) { + case ADD: + action = "add"; //$NON-NLS-1$ + break; + case DELETE: + action = "remove"; //$NON-NLS-1$ + break; + default: + throw new IllegalStateException("Unsupported " + DifferenceKind.class.getSimpleName() //$NON-NLS-1$ + + " value: " + stereotypedElementChange.getKind()); //$NON-NLS-1$ + } + + return stereotypeText.append(" [" + action + "]", //$NON-NLS-1$ //$NON-NLS-2$ + Style.DECORATIONS_STYLER); + } + +} 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 125860d7a..30672cbbd 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, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -75,6 +75,12 @@ public class UMLCompareCustomItemProviderAdapterFactory extends UMLCompareAdapte private UMLDiffCustomItemProvider umlDiffExtendedItemProvider; /** + * This keeps track of the one adapter used for all + * {@link org.eclipse.emf.compare.uml2.internal.StereotypedElementChange} instances. + */ + private StereotypedElementChangeCustomItemProvider stereotypedElementChangeExtendedItemProvider; + + /** * This constructs an instance. */ public UMLCompareCustomItemProviderAdapterFactory() { @@ -97,6 +103,15 @@ public class UMLCompareCustomItemProviderAdapterFactory extends UMLCompareAdapte return stereotypeApplicationChangeExtendedItemProvider; } + @Override + public Adapter createStereotypedElementChangeAdapter() { + if (stereotypedElementChangeExtendedItemProvider == null) { + stereotypedElementChangeExtendedItemProvider = new StereotypedElementChangeCustomItemProvider( + this); + } + return stereotypedElementChangeExtendedItemProvider; + } + /** * {@inheritDoc} * diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore index 16bfecc51..07c952d06 100644 --- a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore +++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore @@ -20,4 +20,5 @@ + diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel index 28467b266..c7c75d7c0 100644 --- a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel +++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2012 Obeo. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Obeo - initial API and implementation" modelDirectory="/org.eclipse.emf.compare.uml2/src-gen" editDirectory="/org.eclipse.emf.compare.uml2.edit/src-gen" modelPluginID="org.eclipse.emf.compare.uml2" modelName="Uml2" editPluginClass="org.eclipse.emf.compare.uml2.internal.provider.UMLCompareEditPlugin" - nonNLSMarkers="true" testSuiteClass="org.eclipse.emf.compare.uml2diff.tests.UML2DiffAllTests" + nonNLSMarkers="true" codeFormatting="true" testSuiteClass="org.eclipse.emf.compare.uml2diff.tests.UML2DiffAllTests" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false" colorProviders="true" fontProviders="true" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.compare/model/compare.genmodel#//compare platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types"> uml2compare.ecore @@ -31,5 +31,6 @@ + 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 26ce2b815..09817e345 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Association Change'. - * - * - * + * 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/DirectedRelationshipChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DirectedRelationshipChange.java index 1e0e03fb1..86a8afb75 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Directed Relationship Change'. - * - * - * + * 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 f5d0799aa..dc22ee617 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Execution Specification Change'. - * - * - * + * 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 be6b2a887..d95be756a 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Extend Change'. - * - * - * + * 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 e785ce6a4..19a75716c 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Generalization Set Change'. + * 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 812ad3ede..b14bfe104 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Interval Constraint Change'. + * 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 9bf96c30e..01b5c6c34 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Message Change'. - * - * - * + * 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 019f72e83..76804151d 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 @@ -13,30 +13,28 @@ package org.eclipse.emf.compare.uml2.internal; import org.eclipse.uml2.uml.Profile; /** - * - * A representation of the model object 'Profile Application Change'. + * 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... + * 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() @@ -46,10 +44,12 @@ 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 a5bf5c215..4e10b1c8b 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 @@ -13,30 +13,29 @@ package org.eclipse.emf.compare.uml2.internal; import org.eclipse.uml2.uml.Stereotype; /** - * - * A representation of the model object 'Stereotype Application Change'. - * - * + * 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... + * 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() @@ -46,10 +45,12 @@ 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 b98ed7d43..2c2d0268e 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Stereotype Attribute Change'. + * 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 86a72b0fd..0fb05dd49 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 @@ -10,13 +10,10 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Stereotype Reference Change'. + * 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/AssociationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypedElementChange.java similarity index 65% copy from plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/AssociationChange.java copy to plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/StereotypedElementChange.java index 26ce2b815..248772399 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/StereotypedElementChange.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012 Obeo. + * Copyright (c) 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,16 +10,13 @@ */ package org.eclipse.emf.compare.uml2.internal; - /** - * - * A representation of the model object 'Association Change'. + * A representation of the model object 'Stereotyped Element Change'. * - * - * - * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getAssociationChange() + * + * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getStereotypedElementChange() * @model * @generated */ -public interface AssociationChange extends UMLDiff { -} // AssociationChange +public interface StereotypedElementChange extends UMLDiff { +} // StereotypedElementChange 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 dedaf8ca3..57d81803a 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 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,128 +13,132 @@ package org.eclipse.emf.compare.uml2.internal; import org.eclipse.emf.ecore.EFactory; /** - * - * The Factory for the model. - * It provides a create method for each non-abstract class of the model. - * + * 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(); /** - * Returns a new object of class 'Association Change'. - * - * + * Returns a new object of class 'Association Change'. + * * @return a new object of class 'Association Change'. * @generated */ 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'. - * - * + * 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'. - * - * + * 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'. - * - * + * 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'. - * - * + * 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'. - * - * + * 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'. - * - * + * 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'. - * - * + * 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'. - * - * + * Returns a new object of class 'Directed Relationship Change'. + * * @return a new object of class 'Directed Relationship Change'. * @generated */ DirectedRelationshipChange createDirectedRelationshipChange(); /** - * Returns the package supported by this factory. - * - * + * Returns a new object of class 'Stereotyped Element Change'. + * + * @return a new object of class 'Stereotyped Element Change'. + * @generated + */ + StereotypedElementChange createStereotypedElementChange(); + + /** + * Returns the package supported by this factory. + * * @return the package supported by this factory. * @generated */ UMLComparePackage getUMLComparePackage(); -} //UMLCompareFactory +} // UMLCompareFactory 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 86a79684d..a8e1ca3ec 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 @@ -16,57 +16,53 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; /** - * - * The Package for the model. - * It contains accessors for the meta objects to represent + * The Package for the model. It contains accessors for the meta objects to + * represent *
    - *
  • each class,
    • - *
  • each feature of each class,
    • - *
  • each enum,
    • - *
  • and each data type
    • + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each enum,
    • + *
  • 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 @@ -74,153 +70,151 @@ public interface UMLComparePackage extends EPackage { int UML_DIFF = 11; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int UML_DIFF__KIND = ComparePackage.DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int UML_DIFF__EQUIVALENCE = ComparePackage.DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int UML_DIFF__CONFLICT = ComparePackage.DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * 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. - * - * + * 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. - * - * + * 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 @@ -228,153 +222,151 @@ public interface UMLComparePackage extends EPackage { int ASSOCIATION_CHANGE = 0; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int ASSOCIATION_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int ASSOCIATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int ASSOCIATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int ASSOCIATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * 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 @@ -382,153 +374,152 @@ public interface UMLComparePackage extends EPackage { int EXTEND_CHANGE = 1; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int EXTEND_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int EXTEND_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int EXTEND_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int EXTEND_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * 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. - * - * + * 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 @@ -536,153 +527,152 @@ public interface UMLComparePackage extends EPackage { int GENERALIZATION_SET_CHANGE = 2; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int GENERALIZATION_SET_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * The feature id for the 'EReference' reference. + * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Generalization Set Change' class. - * - * + * The number of structural features of the 'Generalization Set Change' class. + * * @generated * @ordered */ int GENERALIZATION_SET_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.emf.compare.uml2.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 @@ -690,153 +680,152 @@ public interface UMLComparePackage extends EPackage { int EXECUTION_SPECIFICATION_CHANGE = 3; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int EXECUTION_SPECIFICATION_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * The feature id for the 'EReference' reference. + * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Execution Specification Change' class. - * - * + * The number of structural features of the 'Execution Specification Change' class. + * * @generated * @ordered */ int EXECUTION_SPECIFICATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.emf.compare.uml2.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 @@ -844,153 +833,151 @@ public interface UMLComparePackage extends EPackage { int INTERVAL_CONSTRAINT_CHANGE = 4; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int INTERVAL_CONSTRAINT_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * The feature id for the 'EReference' reference. + * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Interval Constraint Change' class. - * - * + * The number of structural features of the 'Interval Constraint Change' class. + * * @generated * @ordered */ int INTERVAL_CONSTRAINT_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.emf.compare.uml2.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 @@ -998,153 +985,152 @@ public interface UMLComparePackage extends EPackage { int MESSAGE_CHANGE = 5; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int MESSAGE_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int MESSAGE_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int MESSAGE_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int MESSAGE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * 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. - * - * + * 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 @@ -1152,153 +1138,152 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_ATTRIBUTE_CHANGE = 6; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int STEREOTYPE_ATTRIBUTE_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * The feature id for the 'EReference' reference. + * * @generated * @ordered */ int STEREOTYPE_ATTRIBUTE_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Stereotype Attribute Change' class. - * - * + * The number of structural features of the 'Stereotype Attribute Change' class. + * * @generated * @ordered */ 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 @@ -1306,162 +1291,161 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_APPLICATION_CHANGE = 7; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int STEREOTYPE_APPLICATION_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * The feature id for the 'EReference' reference. + * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The feature id for the 'Stereotype' reference. - * - * + * The feature id for the 'Stereotype' reference. + * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE = UML_DIFF_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Stereotype Application Change' class. - * - * + * The number of structural features of the 'Stereotype Application Change' class. + * * @generated * @ordered */ int STEREOTYPE_APPLICATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.compare.uml2.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 @@ -1469,153 +1453,152 @@ public interface UMLComparePackage extends EPackage { int STEREOTYPE_REFERENCE_CHANGE = 8; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int STEREOTYPE_REFERENCE_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * The feature id for the 'EReference' reference. + * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Stereotype Reference Change' class. - * - * + * The number of structural features of the 'Stereotype Reference Change' class. + * * @generated * @ordered */ int STEREOTYPE_REFERENCE_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.emf.compare.uml2.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 @@ -1623,163 +1606,161 @@ public interface UMLComparePackage extends EPackage { int PROFILE_APPLICATION_CHANGE = 9; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int PROFILE_APPLICATION_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * The feature id for the 'EReference' reference. + * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The feature id for the 'Profile' reference. - * - * + * The feature id for the 'Profile' reference. + * * @generated * @ordered */ int PROFILE_APPLICATION_CHANGE__PROFILE = UML_DIFF_FEATURE_COUNT + 0; /** - * The number of structural features of the 'Profile Application Change' class. - * - * + * The number of structural features of the 'Profile Application Change' class. + * * @generated * @ordered */ 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 @@ -1787,154 +1768,304 @@ public interface UMLComparePackage extends EPackage { int DIRECTED_RELATIONSHIP_CHANGE = 10; /** - * The feature id for the 'Match' container reference. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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. - * - * + * 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 */ int DIRECTED_RELATIONSHIP_CHANGE__KIND = UML_DIFF__KIND; /** - * The feature id for the 'Source' attribute. - * - * + * The feature id for the 'Source' attribute. + * * @generated * @ordered */ 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. - * - * + * The feature id for the 'Equivalence' reference. + * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; /** - * The feature id for the 'Conflict' reference. - * - * + * The feature id for the 'Conflict' reference. + * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__CONFLICT = UML_DIFF__CONFLICT; /** - * The feature id for the 'Discriminant' reference. - * - * + * The feature id for the 'Discriminant' reference. + * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT; /** - * The feature id for the 'EReference' reference. - * - * + * The feature id for the 'EReference' reference. + * * @generated * @ordered */ int DIRECTED_RELATIONSHIP_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; /** - * The number of structural features of the 'Directed Relationship Change' class. - * - * + * The number of structural features of the 'Directed Relationship Change' class. + * * @generated * @ordered */ 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. + * + * @see org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl + * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypedElementChange() + * @generated + */ + int STEREOTYPED_ELEMENT_CHANGE = 12; /** - * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.AssociationChange Association Change}'. - * - * + * 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. + * + * @generated + * @ordered + */ + int STEREOTYPED_ELEMENT_CHANGE__KIND = UML_DIFF__KIND; + + /** + * The feature id for the 'Source' attribute. + * + * @generated + * @ordered + */ + int STEREOTYPED_ELEMENT_CHANGE__SOURCE = UML_DIFF__SOURCE; + + /** + * 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 + */ + int STEREOTYPED_ELEMENT_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE; + + /** + * The feature id for the 'Conflict' reference. + * + * @generated + * @ordered + */ + 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 + */ + int STEREOTYPED_ELEMENT_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE; + + /** + * The number of structural features of the 'Stereotyped Element Change' class. + * + * @generated + * @ordered + */ + int STEREOTYPED_ELEMENT_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0; + + /** + * 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 @@ -1942,9 +2073,9 @@ 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 @@ -1952,9 +2083,10 @@ 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 @@ -1962,9 +2094,10 @@ 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 @@ -1972,9 +2105,10 @@ 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 @@ -1982,9 +2116,9 @@ 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 @@ -1992,9 +2126,10 @@ 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 @@ -2002,9 +2137,10 @@ 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 @@ -2012,9 +2148,10 @@ 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() @@ -2023,9 +2160,10 @@ 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 @@ -2033,9 +2171,10 @@ 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 @@ -2043,9 +2182,10 @@ 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() @@ -2054,9 +2194,10 @@ 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 @@ -2064,9 +2205,9 @@ 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 @@ -2074,9 +2215,10 @@ public interface UMLComparePackage extends EPackage { EClass getUMLDiff(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getDiscriminant Discriminant}'. - * - * + * Returns the meta object for the reference ' + * {@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getDiscriminant Discriminant}'. + * * @return the meta object for the reference 'Discriminant'. * @see org.eclipse.emf.compare.uml2.internal.UMLDiff#getDiscriminant() * @see #getUMLDiff() @@ -2085,9 +2227,10 @@ public interface UMLComparePackage extends EPackage { EReference getUMLDiff_Discriminant(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getEReference EReference}'. - * - * + * Returns the meta object for the reference ' + * {@link org.eclipse.emf.compare.uml2.internal.UMLDiff#getEReference EReference}'. + * * @return the meta object for the reference 'EReference'. * @see org.eclipse.emf.compare.uml2.internal.UMLDiff#getEReference() * @see #getUMLDiff() @@ -2096,33 +2239,45 @@ public interface UMLComparePackage extends EPackage { EReference getUMLDiff_EReference(); /** - * Returns the factory that creates the instances of the model. - * - * + * 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 + */ + EClass getStereotypedElementChange(); + + /** + * Returns the factory that creates the instances of the model. + * * @return the factory that creates the instances of the model. * @generated */ UMLCompareFactory getUMLCompareFactory(); /** - * - * Defines literals for the meta objects that represent + * Defines literals for the meta objects that represent *
    - *
  • each class,
    • - *
  • each feature of each class,
    • - *
  • each enum,
    • - *
  • and each data type
    • + *
  • each class,
    • + *
  • each feature of each class,
    • + *
  • each enum,
    • + *
  • 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 @@ -2130,9 +2285,10 @@ 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 @@ -2140,9 +2296,10 @@ 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 @@ -2150,9 +2307,10 @@ 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 @@ -2160,9 +2318,10 @@ 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 @@ -2170,9 +2329,10 @@ 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 @@ -2180,9 +2340,10 @@ 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 @@ -2190,9 +2351,10 @@ 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 @@ -2200,17 +2362,19 @@ public interface UMLComparePackage extends EPackage { EClass STEREOTYPE_APPLICATION_CHANGE = eINSTANCE.getStereotypeApplicationChange(); /** - * The meta object literal for the 'Stereotype' reference feature. - * - * + * The meta object literal for the 'Stereotype' reference feature. + * * @generated */ - EReference STEREOTYPE_APPLICATION_CHANGE__STEREOTYPE = eINSTANCE.getStereotypeApplicationChange_Stereotype(); + 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 @@ -2218,9 +2382,10 @@ 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 @@ -2228,17 +2393,18 @@ public interface UMLComparePackage extends EPackage { EClass PROFILE_APPLICATION_CHANGE = eINSTANCE.getProfileApplicationChange(); /** - * The meta object literal for the 'Profile' reference feature. - * - * + * 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 @@ -2246,9 +2412,9 @@ 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 @@ -2256,21 +2422,32 @@ public interface UMLComparePackage extends EPackage { EClass UML_DIFF = eINSTANCE.getUMLDiff(); /** - * The meta object literal for the 'Discriminant' reference feature. - * - * + * The meta object literal for the 'Discriminant' reference feature. + * * @generated */ EReference UML_DIFF__DISCRIMINANT = eINSTANCE.getUMLDiff_Discriminant(); /** - * The meta object literal for the 'EReference' reference feature. - * - * + * 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. + * + * @see org.eclipse.emf.compare.uml2.internal.impl.StereotypedElementChangeImpl + * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypedElementChange() + * @generated + */ + EClass STEREOTYPED_ELEMENT_CHANGE = eINSTANCE.getStereotypedElementChange(); + } -} //UMLComparePackage +} // 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 ce64695d0..170762a70 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 @@ -16,31 +16,29 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; /** - * - * A representation of the model object 'UML Diff'. - * - * + * A representation of the model object 'UML Diff'. *

* The following features are supported: *

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

- * + * * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getUMLDiff() * @model abstract="true" * @generated */ 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... + * 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() @@ -50,23 +48,24 @@ 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... + * 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() @@ -76,10 +75,11 @@ 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/StereotypedElementChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypedElementChangeImpl.java new file mode 100644 index 000000000..67c3e3a4c --- /dev/null +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/StereotypedElementChangeImpl.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2014 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + */ +package org.eclipse.emf.compare.uml2.internal.impl; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.compare.uml2.internal.StereotypedElementChange; +import org.eclipse.emf.compare.uml2.internal.UMLComparePackage; +import org.eclipse.emf.compare.uml2.internal.spec.UMLDiffSpec; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +/** + * An implementation of the model object 'Stereotyped Element Change'. + * + *

+ *

+ * + * @generated + */ +public class StereotypedElementChangeImpl extends UMLDiffSpec implements StereotypedElementChange { + /** + * + * @generated + */ + protected StereotypedElementChangeImpl() { + super(); + } + + /** + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return UMLComparePackage.Literals.STEREOTYPED_ELEMENT_CHANGE; + } + +} // StereotypedElementChangeImpl 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 4cde76a9b..24848ea0f 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 @@ -21,6 +21,7 @@ import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange; import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange; import org.eclipse.emf.compare.uml2.internal.StereotypeAttributeChange; import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange; +import org.eclipse.emf.compare.uml2.internal.StereotypedElementChange; import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory; import org.eclipse.emf.compare.uml2.internal.UMLComparePackage; import org.eclipse.emf.ecore.EClass; @@ -79,6 +80,7 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac 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(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -139,8 +141,7 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac } /** - * - * + * * @generated */ public StereotypeAttributeChange createStereotypeAttributeChange() { @@ -188,6 +189,15 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac * * @generated */ + public StereotypedElementChange createStereotypedElementChange() { + StereotypedElementChangeImpl stereotypedElementChange = new StereotypedElementChangeImpl(); + return stereotypedElementChange; + } + + /** + * + * @generated + */ public UMLComparePackage getUMLComparePackage() { return (UMLComparePackage)getEPackage(); } 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 463a82a86..3b9e9fb02 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 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,6 +22,7 @@ import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange; import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange; import org.eclipse.emf.compare.uml2.internal.StereotypeAttributeChange; import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange; +import org.eclipse.emf.compare.uml2.internal.StereotypedElementChange; import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory; import org.eclipse.emf.compare.uml2.internal.UMLComparePackage; import org.eclipse.emf.compare.uml2.internal.UMLDiff; @@ -111,6 +112,13 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac private EClass umlDiffEClass = null; /** + * + * + * @generated + */ + private EClass stereotypedElementChangeEClass = null; + + /** * Creates an instance of the model Package, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package * package URI value. @@ -302,6 +310,15 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac } /** + * + * + * @generated + */ + public EClass getStereotypedElementChange() { + return stereotypedElementChangeEClass; + } + + /** * * @generated */ @@ -353,6 +370,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac umlDiffEClass = createEClass(UML_DIFF); createEReference(umlDiffEClass, UML_DIFF__DISCRIMINANT); createEReference(umlDiffEClass, UML_DIFF__EREFERENCE); + + stereotypedElementChangeEClass = createEClass(STEREOTYPED_ELEMENT_CHANGE); } /** @@ -398,6 +417,7 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac profileApplicationChangeEClass.getESuperTypes().add(this.getUMLDiff()); directedRelationshipChangeEClass.getESuperTypes().add(this.getUMLDiff()); umlDiffEClass.getESuperTypes().add(theComparePackage.getDiff()); + stereotypedElementChangeEClass.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$ @@ -428,6 +448,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac 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$ + // Create resource createResource(eNS_URI); } 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 33cb1abac..2f0d15bfa 100644 --- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java +++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2012, 2013 Obeo. + * Copyright (c) 2012, 2014 Obeo. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -117,6 +117,10 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { return createUMLDiffAdapter(); } @Override + public Adapter caseStereotypedElementChange(StereotypedElementChange object) { + return createStereotypedElementChangeAdapter(); + } + @Override public Adapter caseDiff(Diff object) { return createDiffAdapter(); } @@ -297,6 +301,20 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypedElementChange Stereotyped Element 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.uml2.internal.StereotypedElementChange + * @generated + */ + public Adapter createStereotypedElementChangeAdapter() { + 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 * useful to ignore a case when inheritance will catch all the cases anyway. 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 97481b91e..2398e4910 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 @@ -24,6 +24,7 @@ import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange; import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange; import org.eclipse.emf.compare.uml2.internal.StereotypeAttributeChange; import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange; +import org.eclipse.emf.compare.uml2.internal.StereotypedElementChange; import org.eclipse.emf.compare.uml2.internal.UMLComparePackage; import org.eclipse.emf.compare.uml2.internal.UMLDiff; import org.eclipse.emf.ecore.EClass; @@ -188,6 +189,14 @@ public class UMLCompareSwitch { 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); + return result; + } default: return defaultCase(theEObject); } } @@ -359,6 +368,21 @@ public class UMLCompareSwitch { } /** + * Returns the result of interpreting the object as an instance of 'Stereotyped Element Change'. + * + * 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 'Stereotyped Element Change'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseStereotypedElementChange(StereotypedElementChange 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.