From 1359508d8707786a063b6618767ee2772989c752 Mon Sep 17 00:00:00 2001 From: Christian W. Damus Date: Wed, 11 Nov 2015 16:13:06 -0500 Subject: Bug 476683: [AOF Sync] Diagram-to-diagram synchronization on AOF https://bugs.eclipse.org/bugs/show_bug.cgi?id=476683 Update model of synchronization mappings to match the refactoring of the mapping-instance interface and regenerate. --- .../model/syncmapping.ecore | 9 +- .../model/syncmapping.genmodel | 1 + .../model/syncmapping.notation | 215 ++++++++++++++++----- .../model/syncmapping.uml | 113 ++++++----- .../operations/MappingInstanceOperations.java | 9 +- .../aof/sync/emf/syncmapping/MappingInstance.java | 45 +++-- .../aof/sync/emf/syncmapping/MappingModel.java | 3 +- .../sync/emf/syncmapping/SyncMappingFactory.java | 11 +- .../sync/emf/syncmapping/SyncMappingPackage.java | 115 +++++++++-- .../emf/syncmapping/impl/MappingInstanceImpl.java | 39 +++- .../emf/syncmapping/impl/MappingModelImpl.java | 13 +- .../syncmapping/impl/SyncMappingFactoryImpl.java | 45 ++++- .../syncmapping/impl/SyncMappingPackageImpl.java | 78 +++++++- .../util/SyncMappingAdapterFactory.java | 17 +- .../emf/syncmapping/util/SyncMappingResource.java | 10 +- .../util/SyncMappingResourceFactoryImpl.java | 9 +- .../syncmapping/util/SyncMappingResourceImpl.java | 13 +- .../emf/syncmapping/util/SyncMappingSwitch.java | 34 +++- 18 files changed, 605 insertions(+), 174 deletions(-) diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.ecore b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.ecore index df35cbc28b1..da5d89fae2f 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.ecore +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.ecore @@ -66,16 +66,20 @@ - + abstract="true" interface="true"> + + + + @@ -91,4 +95,5 @@ + diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.genmodel b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.genmodel index 173ad54c1e8..ed6868bdd2b 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.genmodel +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.genmodel @@ -48,6 +48,7 @@ + diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.notation b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.notation index 53ee70813ac..237ca388b49 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.notation +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.notation @@ -133,20 +133,20 @@ - + - + - + @@ -172,7 +172,7 @@ - + @@ -187,39 +187,39 @@ - + - + - + - + - + - + @@ -233,13 +233,13 @@ - + - + @@ -253,26 +253,26 @@ - + - + - + - + @@ -307,13 +307,13 @@ - + - + @@ -500,6 +500,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -538,28 +600,34 @@ + + - + + - + + - + + - + + - + @@ -573,41 +641,47 @@ - + + - + + - + - + + - + + - - + + - + + - + + - + @@ -688,41 +762,49 @@ + - + + - + + + - + + - + + - + + - + + - + - + @@ -851,16 +933,6 @@ - - - - - - - - - - @@ -906,4 +978,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.uml b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.uml index d1646e25e47..c0f594c3692 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.uml +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/model/syncmapping.uml @@ -27,68 +27,68 @@ - - - - + + + + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - + - - + + - -
+ +
- + @@ -104,28 +104,28 @@ - -
+ +
- + - -
+ +
- + - -
+ +
- + @@ -139,10 +139,10 @@ - -
+ +
- + @@ -156,35 +156,42 @@ - + + + + + + + - + - -
+ +
- + - - + + + - + - + @@ -199,4 +206,6 @@ + + diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/internal/syncmapping/operations/MappingInstanceOperations.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/internal/syncmapping/operations/MappingInstanceOperations.java index 2fdf2e3ef3c..cfa6ef99336 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/internal/syncmapping/operations/MappingInstanceOperations.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/internal/syncmapping/operations/MappingInstanceOperations.java @@ -34,10 +34,10 @@ import org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingModel; * The following operations are supported: *

*
    - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#addConsequent(org.eclipse.papyrus.aof.sync.IMapping.IMappingInstance) Add Consequent}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#destroy() Destroy}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#iterator() Iterator}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject) EBasic Set Container}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#addConsequent(org.eclipse.papyrus.aof.sync.IMappingInstance) Add Consequent}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#destroy() Destroy}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#iterator() Iterator}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#eBasicSetContainer(org.eclipse.emf.ecore.InternalEObject) EBasic Set Container}
  • *
* * @generated @@ -46,6 +46,7 @@ public class MappingInstanceOperations { /** * * + * * @generated */ protected MappingInstanceOperations() { diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/MappingInstance.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/MappingInstance.java index a05d9c7503d..1590bc3c1c4 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/MappingInstance.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/MappingInstance.java @@ -1,11 +1,11 @@ /** * Copyright (c) 2015 Christian W. Damus and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Christian W. Damus - Initial API and implementation */ @@ -34,11 +34,11 @@ import org.eclipse.papyrus.aof.sync.IMappingInstance; * The following features are supported: *

*
    - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getType Type}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getLeft Left}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getRight Right}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getConsequents Consequent}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getTracker Tracker}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getType Type}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getLeft Left}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getRight Right}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getConsequents Consequent}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getTracker Tracker}
  • *
* * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#getMappingInstance() @@ -54,19 +54,23 @@ public interface MappingInstance extends EObject, AbstractMapping.Internal * there really should be more of a description here... *

* + * * @return the value of the 'Type' attribute. * @see #setType(IMapping) * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#getMappingInstance_Type() * @model dataType="org.eclipse.papyrus.aof.sync.emf.syncmapping.Mapping" required="true" ordered="false" * @generated */ + @Override IMapping getType(); /** * Sets the value of the '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getType Type}' attribute. * * - * @param value the new value of the 'Type' attribute. + * + * @param value + * the new value of the 'Type' attribute. * @see #getType() * @generated */ @@ -80,19 +84,23 @@ public interface MappingInstance extends EObject, AbstractMapping.Internal * there really should be more of a description here... *

* + * * @return the value of the 'Left' attribute. * @see #setLeft(IOne) * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#getMappingInstance_Left() * @model dataType="org.eclipse.papyrus.aof.sync.emf.syncmapping.One" required="true" ordered="false" * @generated */ + @Override IOne getLeft(); /** * Sets the value of the '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getLeft Left}' attribute. * * - * @param value the new value of the 'Left' attribute. + * + * @param value + * the new value of the 'Left' attribute. * @see #getLeft() * @generated */ @@ -106,19 +114,23 @@ public interface MappingInstance extends EObject, AbstractMapping.Internal * there really should be more of a description here... *

* + * * @return the value of the 'Right' attribute. * @see #setRight(IOne) * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#getMappingInstance_Right() * @model dataType="org.eclipse.papyrus.aof.sync.emf.syncmapping.One" required="true" ordered="false" * @generated */ + @Override IOne getRight(); /** * Sets the value of the '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getRight Right}' attribute. * * - * @param value the new value of the 'Right' attribute. + * + * @param value + * the new value of the 'Right' attribute. * @see #getRight() * @generated */ @@ -133,6 +145,7 @@ public interface MappingInstance extends EObject, AbstractMapping.Internal * there really should be more of a description here... *

* + * * @return the value of the 'Consequent' containment reference list. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#getMappingInstance_Consequent() * @model type="org.eclipse.papyrus.aof.sync.emf.syncmapping.IMappingInstance" containment="true" ordered="false" @@ -148,6 +161,7 @@ public interface MappingInstance extends EObject, AbstractMapping.Internal * there really should be more of a description here... *

* + * * @return the value of the 'Tracker' attribute. * @see #setTracker(ObserverTracker) * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#getMappingInstance_Tracker() @@ -160,34 +174,43 @@ public interface MappingInstance extends EObject, AbstractMapping.Internal * Sets the value of the '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getTracker Tracker}' attribute. * * - * @param value the new value of the 'Tracker' attribute. + * + * @param value + * the new value of the 'Tracker' attribute. * @see #getTracker() * @generated */ + @Override void setTracker(ObserverTracker value); /** * * + * * @model consequentType="org.eclipse.papyrus.aof.sync.emf.syncmapping.IMappingInstance" consequentRequired="true" consequentOrdered="false" * @generated */ + @Override void addConsequent(IMappingInstance consequent); /** * * + * * @model * @generated */ + @Override void destroy(); /** * * + * * @model dataType="org.eclipse.papyrus.aof.sync.emf.syncmapping.Iterator>" required="true" ordered="false" * @generated */ + @Override Iterator> iterator(); } // MappingInstance diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/MappingModel.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/MappingModel.java index 2f595eecf55..b3ebef2784a 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/MappingModel.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/MappingModel.java @@ -25,7 +25,7 @@ import org.eclipse.papyrus.aof.sync.IMappingInstance; * The following features are supported: *

*
    - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingModel#getInstances Instance}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingModel#getInstances Instance}
  • *
* * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#getMappingModel() @@ -42,6 +42,7 @@ public interface MappingModel extends EObject { * there really should be more of a description here... *

* + * * @return the value of the 'Instance' containment reference list. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#getMappingModel_Instance() * @model type="org.eclipse.papyrus.aof.sync.emf.syncmapping.IMappingInstance" containment="true" ordered="false" diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/SyncMappingFactory.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/SyncMappingFactory.java index a9f9a139a47..e147e320fd4 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/SyncMappingFactory.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/SyncMappingFactory.java @@ -1,11 +1,11 @@ /** * Copyright (c) 2015 Christian W. Damus and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Christian W. Damus - Initial API and implementation */ @@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EFactory; * The Factory for the model. * It provides a create method for each non-abstract class of the model. * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage * @generated */ @@ -26,6 +27,7 @@ public interface SyncMappingFactory extends EFactory { * The singleton instance of the factory. * * + * * @generated */ SyncMappingFactory eINSTANCE = org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingFactoryImpl.init(); @@ -34,6 +36,7 @@ public interface SyncMappingFactory extends EFactory { * Returns a new object of class 'Mapping Instance'. * * + * * @return a new object of class 'Mapping Instance'. * @generated */ @@ -43,6 +46,7 @@ public interface SyncMappingFactory extends EFactory { * Returns a new object of class 'Mapping Model'. * * + * * @return a new object of class 'Mapping Model'. * @generated */ @@ -52,9 +56,10 @@ public interface SyncMappingFactory extends EFactory { * Returns the package supported by this factory. * * + * * @return the package supported by this factory. * @generated */ SyncMappingPackage getSyncMappingPackage(); -} //SyncMappingFactory +} // SyncMappingFactory diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/SyncMappingPackage.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/SyncMappingPackage.java index 1e73f6bb693..50d26bc310f 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/SyncMappingPackage.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/SyncMappingPackage.java @@ -16,19 +16,19 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; -import org.eclipse.papyrus.aof.sync.IMappingInstance; /** * * 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.papyrus.aof.sync.emf.syncmapping.SyncMappingFactory * @model kind="package" * @generated @@ -38,6 +38,7 @@ public interface SyncMappingPackage extends EPackage { * The package name. * * + * * @generated */ String eNAME = "syncmapping"; //$NON-NLS-1$ @@ -46,6 +47,7 @@ public interface SyncMappingPackage extends EPackage { * The package namespace URI. * * + * * @generated */ String eNS_URI = "http://www.eclipse.org/papyrus/2015/syncmapping"; //$NON-NLS-1$ @@ -54,6 +56,7 @@ public interface SyncMappingPackage extends EPackage { * The package namespace name. * * + * * @generated */ String eNS_PREFIX = "syncmapping"; //$NON-NLS-1$ @@ -62,6 +65,7 @@ public interface SyncMappingPackage extends EPackage { * The singleton instance of the package. * * + * * @generated */ SyncMappingPackage eINSTANCE = org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl.init(); @@ -70,6 +74,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.aof.sync.IMappingInstance IMapping Instance}' class. * * + * * @see org.eclipse.papyrus.aof.sync.IMappingInstance * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getIMappingInstance() * @generated @@ -80,6 +85,7 @@ public interface SyncMappingPackage extends EPackage { * The number of structural features of the 'IMapping Instance' class. * * + * * @generated * @ordered */ @@ -89,6 +95,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.aof.sync.AbstractMapping.InternalInstance Internal Instance}' class. * * + * * @see org.eclipse.papyrus.aof.sync.AbstractMapping.InternalInstance * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getInternalInstance() * @generated @@ -99,6 +106,7 @@ public interface SyncMappingPackage extends EPackage { * The number of structural features of the 'Internal Instance' class. * * + * * @generated * @ordered */ @@ -108,6 +116,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl Mapping Instance}' class. * * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getMappingInstance() * @generated @@ -118,6 +127,7 @@ public interface SyncMappingPackage extends EPackage { * The feature id for the 'Type' attribute. * * + * * @generated * @ordered */ @@ -127,6 +137,7 @@ public interface SyncMappingPackage extends EPackage { * The feature id for the 'Left' attribute. * * + * * @generated * @ordered */ @@ -136,6 +147,7 @@ public interface SyncMappingPackage extends EPackage { * The feature id for the 'Right' attribute. * * + * * @generated * @ordered */ @@ -145,6 +157,7 @@ public interface SyncMappingPackage extends EPackage { * The feature id for the 'Consequent' containment reference list. * * + * * @generated * @ordered */ @@ -154,6 +167,7 @@ public interface SyncMappingPackage extends EPackage { * The feature id for the 'Tracker' attribute. * * + * * @generated * @ordered */ @@ -163,6 +177,7 @@ public interface SyncMappingPackage extends EPackage { * The number of structural features of the 'Mapping Instance' class. * * + * * @generated * @ordered */ @@ -172,6 +187,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the '{@link org.eclipse.emf.ecore.InternalEObject Internal EObject}' class. * * + * * @see org.eclipse.emf.ecore.InternalEObject * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getInternalEObject() * @generated @@ -182,6 +198,7 @@ public interface SyncMappingPackage extends EPackage { * The number of structural features of the 'Internal EObject' class. * * + * * @generated * @ordered */ @@ -191,6 +208,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingModelImpl Mapping Model}' class. * * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingModelImpl * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getMappingModel() * @generated @@ -201,6 +219,7 @@ public interface SyncMappingPackage extends EPackage { * The feature id for the 'Instance' containment reference list. * * + * * @generated * @ordered */ @@ -210,6 +229,7 @@ public interface SyncMappingPackage extends EPackage { * The number of structural features of the 'Mapping Model' class. * * + * * @generated * @ordered */ @@ -219,6 +239,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the 'One' data type. * * + * * @see org.eclipse.papyrus.aof.core.IOne * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getOne() * @generated @@ -229,6 +250,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the 'Mapping' data type. * * + * * @see org.eclipse.papyrus.aof.sync.IMapping * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getMapping() * @generated @@ -239,6 +261,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the 'Observer Tracker' data type. * * + * * @see org.eclipse.papyrus.aof.core.utils.ObserverTracker * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getObserverTracker() * @generated @@ -249,6 +272,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object id for the 'Iterator' data type. * * + * * @see java.util.Iterator * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getIterator() * @generated @@ -256,10 +280,23 @@ public interface SyncMappingPackage extends EPackage { int ITERATOR = 8; + /** + * The meta object id for the 'Mapping Context' data type. + * + * + * + * @see org.eclipse.papyrus.aof.sync.IMappingContext + * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getMappingContext() + * @generated + */ + int MAPPING_CONTEXT = 9; + + /** * Returns the meta object for class '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance Mapping Instance}'. * * + * * @return the meta object for class 'Mapping Instance'. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance * @generated @@ -270,6 +307,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getType Type}'. * * + * * @return the meta object for the attribute 'Type'. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getType() * @see #getMappingInstance() @@ -281,6 +319,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getLeft Left}'. * * + * * @return the meta object for the attribute 'Left'. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getLeft() * @see #getMappingInstance() @@ -292,6 +331,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getRight Right}'. * * + * * @return the meta object for the attribute 'Right'. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getRight() * @see #getMappingInstance() @@ -303,6 +343,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getConsequents Consequent}'. * * + * * @return the meta object for the containment reference list 'Consequent'. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getConsequents() * @see #getMappingInstance() @@ -314,6 +355,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for the attribute '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getTracker Tracker}'. * * + * * @return the meta object for the attribute 'Tracker'. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance#getTracker() * @see #getMappingInstance() @@ -325,9 +367,10 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.aof.sync.IMappingInstance IMapping Instance}'. * * + * * @return the meta object for class 'IMapping Instance'. * @see org.eclipse.papyrus.aof.sync.IMappingInstance - * @model instanceClass="org.eclipse.papyrus.aof.sync.IMapping$Instance" typeParameters="F T" + * @model instanceClass="org.eclipse.papyrus.aof.sync.IMappingInstance" typeParameters="F T" * @generated */ EClass getIMappingInstance(); @@ -336,9 +379,10 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.aof.sync.AbstractMapping.InternalInstance Internal Instance}'. * * + * * @return the meta object for class 'Internal Instance'. * @see org.eclipse.papyrus.aof.sync.AbstractMapping.InternalInstance - * @model instanceClass="org.eclipse.papyrus.aof.sync.AbstractMapping$InternalInstance" typeParameters="F T" superTypes="org.eclipse.papyrus.aof.sync.emf.syncmapping.IMappingInstance" + * @model instanceClass="org.eclipse.papyrus.aof.sync.AbstractMapping$InternalInstance" typeParameters="F T" superTypes="org.eclipse.papyrus.aof.sync.emf.syncmapping.IMappingInstance" * @generated */ EClass getInternalInstance(); @@ -347,6 +391,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.emf.ecore.InternalEObject Internal EObject}'. * * + * * @return the meta object for class 'Internal EObject'. * @see org.eclipse.emf.ecore.InternalEObject * @model instanceClass="org.eclipse.emf.ecore.InternalEObject" @@ -358,6 +403,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for class '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingModel Mapping Model}'. * * + * * @return the meta object for class 'Mapping Model'. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingModel * @generated @@ -368,6 +414,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingModel#getInstances Instance}'. * * + * * @return the meta object for the containment reference list 'Instance'. * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingModel#getInstances() * @see #getMappingModel() @@ -379,6 +426,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for data type '{@link org.eclipse.papyrus.aof.core.IOne One}'. * * + * * @return the meta object for data type 'One'. * @see org.eclipse.papyrus.aof.core.IOne * @model instanceClass="org.eclipse.papyrus.aof.core.IOne" typeParameters="E" @@ -390,6 +438,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for data type '{@link org.eclipse.papyrus.aof.sync.IMapping Mapping}'. * * + * * @return the meta object for data type 'Mapping'. * @see org.eclipse.papyrus.aof.sync.IMapping * @model instanceClass="org.eclipse.papyrus.aof.sync.IMapping" typeParameters="F T" @@ -401,6 +450,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for data type '{@link org.eclipse.papyrus.aof.core.utils.ObserverTracker Observer Tracker}'. * * + * * @return the meta object for data type 'Observer Tracker'. * @see org.eclipse.papyrus.aof.core.utils.ObserverTracker * @model instanceClass="org.eclipse.papyrus.aof.core.utils.ObserverTracker" @@ -412,6 +462,7 @@ public interface SyncMappingPackage extends EPackage { * Returns the meta object for data type '{@link java.util.Iterator Iterator}'. * * + * * @return the meta object for data type 'Iterator'. * @see java.util.Iterator * @model instanceClass="java.util.Iterator" typeParameters="E" @@ -419,10 +470,23 @@ public interface SyncMappingPackage extends EPackage { */ EDataType getIterator(); + /** + * Returns the meta object for data type '{@link org.eclipse.papyrus.aof.sync.IMappingContext Mapping Context}'. + * + * + * + * @return the meta object for data type 'Mapping Context'. + * @see org.eclipse.papyrus.aof.sync.IMappingContext + * @model instanceClass="org.eclipse.papyrus.aof.sync.IMappingContext" + * @generated + */ + EDataType getMappingContext(); + /** * Returns the factory that creates the instances of the model. * * + * * @return the factory that creates the instances of the model. * @generated */ @@ -432,12 +496,13 @@ public interface SyncMappingPackage extends EPackage { * * 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 */ interface Literals { @@ -445,6 +510,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl Mapping Instance}' class. * * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getMappingInstance() * @generated @@ -455,6 +521,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Type' attribute feature. * * + * * @generated */ EAttribute MAPPING_INSTANCE__TYPE = eINSTANCE.getMappingInstance_Type(); @@ -463,6 +530,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Left' attribute feature. * * + * * @generated */ EAttribute MAPPING_INSTANCE__LEFT = eINSTANCE.getMappingInstance_Left(); @@ -471,6 +539,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Right' attribute feature. * * + * * @generated */ EAttribute MAPPING_INSTANCE__RIGHT = eINSTANCE.getMappingInstance_Right(); @@ -479,6 +548,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Consequent' containment reference list feature. * * + * * @generated */ EReference MAPPING_INSTANCE__CONSEQUENT = eINSTANCE.getMappingInstance_Consequent(); @@ -487,6 +557,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Tracker' attribute feature. * * + * * @generated */ EAttribute MAPPING_INSTANCE__TRACKER = eINSTANCE.getMappingInstance_Tracker(); @@ -495,6 +566,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.aof.sync.IMappingInstance IMapping Instance}' class. * * + * * @see org.eclipse.papyrus.aof.sync.IMappingInstance * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getIMappingInstance() * @generated @@ -505,6 +577,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.aof.sync.AbstractMapping.InternalInstance Internal Instance}' class. * * + * * @see org.eclipse.papyrus.aof.sync.AbstractMapping.InternalInstance * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getInternalInstance() * @generated @@ -515,6 +588,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.emf.ecore.InternalEObject Internal EObject}' class. * * + * * @see org.eclipse.emf.ecore.InternalEObject * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getInternalEObject() * @generated @@ -525,6 +599,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the '{@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingModelImpl Mapping Model}' class. * * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingModelImpl * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getMappingModel() * @generated @@ -535,6 +610,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Instance' containment reference list feature. * * + * * @generated */ EReference MAPPING_MODEL__INSTANCE = eINSTANCE.getMappingModel_Instance(); @@ -543,6 +619,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'One' data type. * * + * * @see org.eclipse.papyrus.aof.core.IOne * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getOne() * @generated @@ -553,6 +630,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Mapping' data type. * * + * * @see org.eclipse.papyrus.aof.sync.IMapping * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getMapping() * @generated @@ -563,6 +641,7 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Observer Tracker' data type. * * + * * @see org.eclipse.papyrus.aof.core.utils.ObserverTracker * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getObserverTracker() * @generated @@ -573,12 +652,24 @@ public interface SyncMappingPackage extends EPackage { * The meta object literal for the 'Iterator' data type. * * + * * @see java.util.Iterator * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getIterator() * @generated */ EDataType ITERATOR = eINSTANCE.getIterator(); + /** + * The meta object literal for the 'Mapping Context' data type. + * + * + * + * @see org.eclipse.papyrus.aof.sync.IMappingContext + * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.SyncMappingPackageImpl#getMappingContext() + * @generated + */ + EDataType MAPPING_CONTEXT = eINSTANCE.getMappingContext(); + } -} //SyncMappingPackage +} // SyncMappingPackage diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/MappingInstanceImpl.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/MappingInstanceImpl.java index c9ee47b1de9..8c004dc009a 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/MappingInstanceImpl.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/MappingInstanceImpl.java @@ -47,11 +47,11 @@ import org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage; * The following features are implemented: *

*
    - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getType Type}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getLeft Left}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getRight Right}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getConsequents Consequent}
  • - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getTracker Tracker}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getType Type}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getLeft Left}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getRight Right}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getConsequents Consequent}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingInstanceImpl#getTracker Tracker}
  • *
* * @generated @@ -61,6 +61,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl * The cached value of the '{@link #getType() Type}' attribute. * * + * * @see #getType() * @generated * @ordered @@ -71,6 +72,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl * The cached value of the '{@link #getLeft() Left}' attribute. * * + * * @see #getLeft() * @generated * @ordered @@ -81,6 +83,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl * The cached value of the '{@link #getRight() Right}' attribute. * * + * * @see #getRight() * @generated * @ordered @@ -91,6 +94,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl * The cached value of the '{@link #getConsequents() Consequent}' containment reference list. * * + * * @see #getConsequents() * @generated * @ordered @@ -101,6 +105,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl * The default value of the '{@link #getTracker() Tracker}' attribute. * * + * * @see #getTracker() * @generated * @ordered @@ -111,6 +116,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl * The cached value of the '{@link #getTracker() Tracker}' attribute. * * + * * @see #getTracker() * @generated * @ordered @@ -120,6 +126,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ protected MappingInstanceImpl() { @@ -129,6 +136,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -139,6 +147,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -149,6 +158,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -163,6 +173,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -173,6 +184,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -187,6 +199,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -197,6 +210,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -211,6 +225,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -224,6 +239,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -234,6 +250,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -248,6 +265,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -258,6 +276,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -268,6 +287,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -278,6 +298,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ public void eBasicSetContainerGen(InternalEObject newContainer) { @@ -296,6 +317,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -310,6 +332,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -332,6 +355,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @SuppressWarnings("unchecked") @@ -361,6 +385,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -388,6 +413,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -410,6 +436,7 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl /** * * + * * @generated */ @Override @@ -431,4 +458,4 @@ public class MappingInstanceImpl extends MinimalEObjectImpl.Container impl return result.toString(); } -} //MappingInstanceImpl +} // MappingInstanceImpl diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/MappingModelImpl.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/MappingModelImpl.java index 7762612580d..9daf2164645 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/MappingModelImpl.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/MappingModelImpl.java @@ -36,7 +36,7 @@ import org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage; * The following features are implemented: *

*
    - *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingModelImpl#getInstances Instance}
  • + *
  • {@link org.eclipse.papyrus.aof.sync.emf.syncmapping.impl.MappingModelImpl#getInstances Instance}
  • *
* * @generated @@ -46,6 +46,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma * The cached value of the '{@link #getInstances() Instance}' containment reference list. * * + * * @see #getInstances() * @generated * @ordered @@ -55,6 +56,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma /** * * + * * @generated */ protected MappingModelImpl() { @@ -64,6 +66,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma /** * * + * * @generated */ @Override @@ -74,6 +77,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma /** * * + * * @generated */ @Override @@ -87,6 +91,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma /** * * + * * @generated */ @Override @@ -101,6 +106,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma /** * * + * * @generated */ @Override @@ -115,6 +121,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma /** * * + * * @generated */ @SuppressWarnings("unchecked") @@ -132,6 +139,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma /** * * + * * @generated */ @Override @@ -147,6 +155,7 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma /** * * + * * @generated */ @Override @@ -158,4 +167,4 @@ public class MappingModelImpl extends MinimalEObjectImpl.Container implements Ma return super.eIsSet(featureID); } -} //MappingModelImpl +} // MappingModelImpl diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/SyncMappingFactoryImpl.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/SyncMappingFactoryImpl.java index 4a332fa417c..90dd66449d8 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/SyncMappingFactoryImpl.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/SyncMappingFactoryImpl.java @@ -28,12 +28,14 @@ import org.eclipse.papyrus.aof.core.utils.ObserverTracker; import org.eclipse.papyrus.aof.sync.IMapping; +import org.eclipse.papyrus.aof.sync.IMappingContext; import org.eclipse.papyrus.aof.sync.emf.syncmapping.*; /** * * An implementation of the model Factory. * + * * @generated */ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingFactory { @@ -41,6 +43,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF * Creates the default factory implementation. * * + * * @generated */ public static SyncMappingFactory init() { @@ -59,6 +62,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF * Creates an instance of the factory. * * + * * @generated */ public SyncMappingFactoryImpl() { @@ -68,6 +72,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ @Override @@ -85,6 +90,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ @Override @@ -98,6 +104,8 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF return createObserverTrackerFromString(eDataType, initialValue); case SyncMappingPackage.ITERATOR: return createIteratorFromString(eDataType, initialValue); + case SyncMappingPackage.MAPPING_CONTEXT: + return createMappingContextFromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -106,6 +114,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ @Override @@ -119,6 +128,8 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF return convertObserverTrackerToString(eDataType, instanceValue); case SyncMappingPackage.ITERATOR: return convertIteratorToString(eDataType, instanceValue); + case SyncMappingPackage.MAPPING_CONTEXT: + return convertMappingContextToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -127,6 +138,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ @Override @@ -138,6 +150,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ @Override @@ -149,6 +162,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ public IOne createOneFromString(EDataType eDataType, String initialValue) { @@ -158,6 +172,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ public String convertOneToString(EDataType eDataType, Object instanceValue) { @@ -167,6 +182,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ public IMapping createMappingFromString(EDataType eDataType, String initialValue) { @@ -176,6 +192,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ public String convertMappingToString(EDataType eDataType, Object instanceValue) { @@ -185,6 +202,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ public ObserverTracker createObserverTrackerFromString(EDataType eDataType, String initialValue) { @@ -194,6 +212,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ public String convertObserverTrackerToString(EDataType eDataType, Object instanceValue) { @@ -203,6 +222,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ public Iterator createIteratorFromString(EDataType eDataType, String initialValue) { @@ -212,6 +232,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @generated */ public String convertIteratorToString(EDataType eDataType, Object instanceValue) { @@ -221,6 +242,27 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * + * @generated + */ + public IMappingContext createMappingContextFromString(EDataType eDataType, String initialValue) { + return (IMappingContext) super.createFromString(eDataType, initialValue); + } + + /** + * + * + * + * @generated + */ + public String convertMappingContextToString(EDataType eDataType, Object instanceValue) { + return super.convertToString(eDataType, instanceValue); + } + + /** + * + * + * * @generated */ @Override @@ -231,6 +273,7 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF /** * * + * * @deprecated * @generated */ @@ -239,4 +282,4 @@ public class SyncMappingFactoryImpl extends EFactoryImpl implements SyncMappingF return SyncMappingPackage.eINSTANCE; } -} //SyncMappingFactoryImpl +} // SyncMappingFactoryImpl diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/SyncMappingPackageImpl.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/SyncMappingPackageImpl.java index 3f4f247acae..cfdd1b71415 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/SyncMappingPackageImpl.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/impl/SyncMappingPackageImpl.java @@ -31,6 +31,7 @@ import org.eclipse.papyrus.aof.core.utils.ObserverTracker; import org.eclipse.papyrus.aof.sync.AbstractMapping; import org.eclipse.papyrus.aof.sync.IMapping; +import org.eclipse.papyrus.aof.sync.IMappingContext; import org.eclipse.papyrus.aof.sync.IMappingInstance; import org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingInstance; import org.eclipse.papyrus.aof.sync.emf.syncmapping.MappingModel; @@ -41,12 +42,14 @@ import org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage; * * An implementation of the model Package. * + * * @generated */ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingPackage { /** * * + * * @generated */ private EClass mappingInstanceEClass = null; @@ -54,6 +57,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private EClass iMappingInstanceEClass = null; @@ -61,6 +65,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private EClass internalInstanceEClass = null; @@ -68,6 +73,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private EClass internalEObjectEClass = null; @@ -75,6 +81,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private EClass mappingModelEClass = null; @@ -82,6 +89,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private EDataType oneEDataType = null; @@ -89,6 +97,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private EDataType mappingEDataType = null; @@ -96,6 +105,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private EDataType observerTrackerEDataType = null; @@ -103,20 +113,31 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private EDataType iteratorEDataType = null; + /** + * + * + * + * @generated + */ + private EDataType mappingContextEDataType = 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. - *

Note: the correct way to create the package is via the static + *

+ * Note: the correct way to create the package is via the static * factory method {@link #init init()}, which also performs * initialization of the package, or returns the registered package, * if one already exists. * * + * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage#eNS_URI * @see #init() @@ -129,6 +150,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private static boolean isInited = false; @@ -136,10 +158,12 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. * - *

This method is used to initialize {@link SyncMappingPackage#eINSTANCE} when that field is accessed. + *

+ * This method is used to initialize {@link SyncMappingPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * * + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -173,6 +197,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -183,6 +208,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -193,6 +219,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -203,6 +230,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -213,6 +241,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -223,6 +252,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -233,6 +263,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -243,6 +274,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -253,6 +285,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -263,6 +296,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -273,6 +307,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -283,6 +318,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -293,6 +329,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -303,6 +340,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -313,6 +351,7 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ @Override @@ -323,6 +362,18 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * + * @generated + */ + @Override + public EDataType getMappingContext() { + return mappingContextEDataType; + } + + /** + * + * + * * @generated */ @Override @@ -333,15 +384,17 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP /** * * + * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is + * Creates the meta-model objects for the package. This method is * guarded to have no affect on any invocation but its first. * * + * * @generated */ public void createPackageContents() { @@ -372,20 +425,23 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP mappingEDataType = createEDataType(MAPPING); observerTrackerEDataType = createEDataType(OBSERVER_TRACKER); iteratorEDataType = createEDataType(ITERATOR); + mappingContextEDataType = createEDataType(MAPPING_CONTEXT); } /** * * + * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This + * Complete the initialization of the package and its meta-model. This * method is guarded to have no affect on any invocation but its first. * * + * * @generated */ public void initializePackageContents() { @@ -404,8 +460,8 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP ETypeParameter mappingInstanceEClass_T = addETypeParameter(mappingInstanceEClass, "T"); //$NON-NLS-1$ addETypeParameter(iMappingInstanceEClass, "F"); //$NON-NLS-1$ addETypeParameter(iMappingInstanceEClass, "T"); //$NON-NLS-1$ - addETypeParameter(internalInstanceEClass, "F"); //$NON-NLS-1$ - addETypeParameter(internalInstanceEClass, "T"); //$NON-NLS-1$ + ETypeParameter internalInstanceEClass_F = addETypeParameter(internalInstanceEClass, "F"); //$NON-NLS-1$ + ETypeParameter internalInstanceEClass_T = addETypeParameter(internalInstanceEClass, "T"); //$NON-NLS-1$ addETypeParameter(oneEDataType, "E"); //$NON-NLS-1$ addETypeParameter(mappingEDataType, "F"); //$NON-NLS-1$ addETypeParameter(mappingEDataType, "T"); //$NON-NLS-1$ @@ -420,7 +476,12 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP g2 = createEGenericType(mappingInstanceEClass_T); g1.getETypeArguments().add(g2); mappingInstanceEClass.getEGenericSuperTypes().add(g1); - internalInstanceEClass.getESuperTypes().add(this.getIMappingInstance()); + g1 = createEGenericType(this.getIMappingInstance()); + g2 = createEGenericType(internalInstanceEClass_F); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(internalInstanceEClass_T); + g1.getETypeArguments().add(g2); + internalInstanceEClass.getEGenericSuperTypes().add(g1); // Initialize classes and features; add operations and parameters initEClass(mappingInstanceEClass, MappingInstance.class, "MappingInstance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -488,9 +549,10 @@ public class SyncMappingPackageImpl extends EPackageImpl implements SyncMappingP initEDataType(mappingEDataType, IMapping.class, "Mapping", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEDataType(observerTrackerEDataType, ObserverTracker.class, "ObserverTracker", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEDataType(iteratorEDataType, Iterator.class, "Iterator", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEDataType(mappingContextEDataType, IMappingContext.class, "MappingContext", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ // Create resource createResource(eNS_URI); } -} //SyncMappingPackageImpl +} // SyncMappingPackageImpl diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingAdapterFactory.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingAdapterFactory.java index 8122143bfd3..92a0f7ac490 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingAdapterFactory.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingAdapterFactory.java @@ -28,6 +28,7 @@ import org.eclipse.papyrus.aof.sync.emf.syncmapping.*; * The Adapter Factory for the model. * It provides an adapter createXXX method for each class of the model. * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage * @generated */ @@ -36,6 +37,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * The cached model package. * * + * * @generated */ protected static SyncMappingPackage modelPackage; @@ -44,6 +46,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * Creates an instance of the adapter factory. * * + * * @generated */ public SyncMappingAdapterFactory() { @@ -57,6 +60,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * * This implementation returns true if the object is either the model's package or is an instance object of the model. * + * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -75,6 +79,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * The switch that delegates to the createXXX methods. * * + * * @generated */ protected SyncMappingSwitch modelSwitch = new SyncMappingSwitch() { @@ -113,7 +118,9 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * Creates an adapter for the target. * * - * @param target the object to adapt. + * + * @param target + * the object to adapt. * @return the adapter for the target. * @generated */ @@ -129,6 +136,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * 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.papyrus.aof.sync.emf.syncmapping.MappingInstance * @generated @@ -143,6 +151,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * 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.papyrus.aof.sync.IMappingInstance * @generated @@ -157,6 +166,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * 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.papyrus.aof.sync.AbstractMapping.InternalInstance * @generated @@ -171,6 +181,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * 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.ecore.InternalEObject * @generated @@ -185,6 +196,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * 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.papyrus.aof.sync.emf.syncmapping.MappingModel * @generated @@ -198,6 +210,7 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { * * This default implementation returns null. * + * * @return the new adapter. * @generated */ @@ -205,4 +218,4 @@ public class SyncMappingAdapterFactory extends AdapterFactoryImpl { return null; } -} //SyncMappingAdapterFactory +} // SyncMappingAdapterFactory diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResource.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResource.java index 2bb5dfe2297..c83e7a75837 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResource.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResource.java @@ -1,11 +1,11 @@ /** * Copyright (c) 2015 Christian W. Damus and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Christian W. Damus - Initial API and implementation */ @@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.resource.Resource; * * The resource associated with the 'syncmapping' package. * + * * @generated */ public interface SyncMappingResource extends Resource { @@ -24,6 +25,7 @@ public interface SyncMappingResource extends Resource { * * The factory for 'syncmapping' resources. * + * * @generated */ public interface Factory @@ -32,6 +34,7 @@ public interface SyncMappingResource extends Resource { /** * * + * * @generated */ public static final Factory INSTANCE = new SyncMappingResourceFactoryImpl(); @@ -42,8 +45,9 @@ public interface SyncMappingResource extends Resource { * * The file extension for 'syncmapping' resources. * + * * @generated */ public static final String FILE_EXTENSION = "syncmapping"; //$NON-NLS-1$ -} //SyncMappingResource +} // SyncMappingResource diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResourceFactoryImpl.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResourceFactoryImpl.java index 1d64bc07a63..000752a64c9 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResourceFactoryImpl.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResourceFactoryImpl.java @@ -1,11 +1,11 @@ /** * Copyright (c) 2015 Christian W. Damus and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Christian W. Damus - Initial API and implementation */ @@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; * * The Resource Factory associated with the package. * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.util.SyncMappingResourceImpl * @generated */ @@ -29,6 +30,7 @@ public class SyncMappingResourceFactoryImpl extends ResourceFactoryImpl implemen * Creates an instance of the resource factory. * * + * * @generated */ public SyncMappingResourceFactoryImpl() { @@ -39,6 +41,7 @@ public class SyncMappingResourceFactoryImpl extends ResourceFactoryImpl implemen * Creates an instance of the resource. * * + * * @generated */ @Override @@ -47,4 +50,4 @@ public class SyncMappingResourceFactoryImpl extends ResourceFactoryImpl implemen return result; } -} //SyncMappingResourceFactoryImpl +} // SyncMappingResourceFactoryImpl diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResourceImpl.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResourceImpl.java index d8a37ec7329..04cf76229c5 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResourceImpl.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingResourceImpl.java @@ -1,11 +1,11 @@ /** * Copyright (c) 2015 Christian W. Damus and others. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Christian W. Damus - Initial API and implementation */ @@ -22,6 +22,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceImpl; * * The Resource associated with the package. * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.util.SyncMappingResourceFactoryImpl * @generated */ @@ -30,7 +31,9 @@ public class SyncMappingResourceImpl extends ResourceImpl implements SyncMapping * Creates an instance of the resource. * * - * @param uri the URI of the new resource. + * + * @param uri + * the URI of the new resource. * @generated */ public SyncMappingResourceImpl(URI uri) { @@ -45,7 +48,7 @@ public class SyncMappingResourceImpl extends ResourceImpl implements SyncMapping public void load(Map options) throws IOException { setLoaded(true); } - + /** * Persistence is not supported; save requests are just ignored (except that * I become {@linkplain Resource#isModified() unmodified}. @@ -54,4 +57,4 @@ public class SyncMappingResourceImpl extends ResourceImpl implements SyncMapping public void save(Map options) throws IOException { setModified(false); } -} //SyncMappingResourceImpl +} // SyncMappingResourceImpl diff --git a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingSwitch.java b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingSwitch.java index ef41cc8818d..45c1b0f1026 100644 --- a/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingSwitch.java +++ b/extraplugins/aof/sync/org.eclipse.papyrus.aof.sync.emf/src-gen/org/eclipse/papyrus/aof/sync/emf/syncmapping/util/SyncMappingSwitch.java @@ -31,6 +31,7 @@ import org.eclipse.papyrus.aof.sync.emf.syncmapping.*; * until a non-null result is returned, * which is the result of the switch. * + * * @see org.eclipse.papyrus.aof.sync.emf.syncmapping.SyncMappingPackage * @generated */ @@ -39,6 +40,7 @@ public class SyncMappingSwitch extends Switch { * The cached model package * * + * * @generated */ protected static SyncMappingPackage modelPackage; @@ -47,6 +49,7 @@ public class SyncMappingSwitch extends Switch { * Creates an instance of the switch. * * + * * @generated */ public SyncMappingSwitch() { @@ -59,7 +62,9 @@ public class SyncMappingSwitch extends Switch { * Checks whether this is a switch for the given package. * * - * @param ePackage the package in question. + * + * @param ePackage + * the package in question. * @return whether this is a switch for the given package. * @generated */ @@ -72,6 +77,7 @@ public class SyncMappingSwitch extends Switch { * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. * * + * * @return the first non-null result returned by a caseXXX call. * @generated */ @@ -138,7 +144,9 @@ public class SyncMappingSwitch extends Switch { * This implementation returns null; * returning a non-null result will terminate the switch. * - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Mapping Instance'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -153,7 +161,9 @@ public class SyncMappingSwitch extends Switch { * This implementation returns null; * returning a non-null result will terminate the switch. * - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'IMapping Instance'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -168,7 +178,9 @@ public class SyncMappingSwitch extends Switch { * This implementation returns null; * returning a non-null result will terminate the switch. * - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Internal Instance'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -183,7 +195,9 @@ public class SyncMappingSwitch extends Switch { * This implementation returns null; * returning a non-null result will terminate the switch. * - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Internal EObject'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -198,7 +212,9 @@ public class SyncMappingSwitch extends Switch { * This implementation returns null; * returning a non-null result will terminate the switch. * - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Mapping Model'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -213,7 +229,9 @@ public class SyncMappingSwitch extends Switch { * This implementation returns null; * returning a non-null result will terminate the switch, but this is the last case anyway. * - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'EObject'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated @@ -223,4 +241,4 @@ public class SyncMappingSwitch extends Switch { return null; } -} //SyncMappingSwitch +} // SyncMappingSwitch -- cgit v1.2.3