@@ -5996,10 +6006,9 @@
-
James Bruck and Kenn Hussey, IBM -
+James Bruck and Kenn Hussey, IBM
-
● Summary of newly refined concepts will be covered in the section “Superstructure Specification Changes”
-● Migration tips will be covered in the section entitled “API Migration”.
-●
Data migration of existing models and profiles
@@ -6114,8 +6123,8 @@
This refers to the latest version of the UML API which is
based on the UML2.1 specification defined by OMG. The latest draft of the UML 2.1 Superstructure Specification
- can be found at: The latest draft of the UML 2.1 Superstructure
+ Specification can be found at: http://www.omg.org/docs/ptc/06-04-02.pdf
Finalization Task Force. A process which the OMG uses - to finalize a specification.
+Finalization Task Force. A process which the OMG + uses to finalize a specification.
-
Depending on your requirements, you will presumably be -interested in one or more of the following aspects of migration: API migration, +
Depending on your requirements, you will presumably be interested +in one or more of the following aspects of migration: API migration, artifact migration, or discovering what has changed in UML.
This document is structured to help you accomplish your @@ -6291,26 +6300,26 @@ 2.0 Project Plan, several key points should be re-iterated before continuing:
-● The older UML2 1.x version will not be shipped together with the newer UML2 2.0 version.
-● UML2 2.0 will not be upwards contract-compatible with UML2 1.x.
-● UML2 2.0 will not be upwards binary-compatible with UML2 1.x.
-● The @@ -6353,7 +6362,7 @@
-
@@ -6367,7 +6376,7 @@ that the UML2 1.x is based on an interim draft of the UML 2.0 version of the specification. -
● Also, @@ -6388,17 +6397,17 @@ discussed in this document has been obtained is from summarizing these FTF and RTF ballots.
--
Several key changes can be distilled out of the updated Superstructure -specification.
+Several key changes can be distilled out of the updated +Superstructure specification.
Let’s first review the differences between Trigger, Event and Message:
-●
@@ -6446,46 +6455,40 @@
So what has changed? In the latest version of the specification, the concept of
-Event has been separated from the concept of Trigger. The Trigger metatype is now a concrete class whereas in the past, this
-was an abstract class. The various concrete triggers such as CallTrigger, have been removed and replaced by a
-corresponding Event type (i.e. CallEvent).
For a given model to be considered valid, all triggers -must refer to some event. A trigger must refer to an event since triggers relate -events to behaviors.
+must refer to some event. A trigger must refer to an event since triggers +relate events to behaviors. -Triggers can be owned either by transitions or by behaviored classifiers (as an example).
+Triggers can be owned either by transitions or by +behaviored classifiers (as an example).
Existing code presumably has transitions owning one of the -various trigger types such as CallTrigger. Such -code should be changed such that the transition will refer to the concrete -trigger type and the trigger will refer to an event created somewhere at the -package level (events are packageable elements and -are owned by some package).
+various trigger types such as CallTrigger. Such code should be changed +such that the transition will refer to the concrete trigger type and the +trigger will refer to an event created somewhere at the package level (events +are packageable elements and are owned by some package).In order to create an event for a particular transition, one could:
-● Find the nearest package using the Element#getNearestPackage() function.
+style='font-family:"Courier New"'>Element#getNearestPackage() +function. -● -Call Package#createPackagedElement(EClass). You would pass the event type -as a parameter.
+Call Package#createPackagedElement(EClass). You would pass +the event type as a parameter.@@ -6502,19 +6505,19 @@ occurrence. An event is a model element that specifies a set of possible event occurrences all of the same kind. -
● Event
-o State changes of a system are the result of the occurrence of some event.
-o Creation @@ -6526,28 +6529,28 @@ style='font:7.0pt "Times New Roman"'> Destruction events occur when the system destroys an object.
-o Execution events occur at the start of an Action or Behavior which is referenced by the object of the lifeline.
-o Message events occur as a result of the sending or the receiving of messages from one object to another.
-▪ The message event instance can reference either an operation that was called or a signal that is sent.
-▪ It @@ -6559,26 +6562,26 @@
● -OccurrenceSpecification
+OccurrenceSpecification -o Occurrence specifications model the occurrence of an event.
-▪ Occurrence specifications represents points on a lifeline that deliver the anchors for Messages and execution specifications
-▪ Occurrence @@ -6587,13 +6590,13 @@
● -ExecutionOccurrenceSpecification
+ExecutionOccurrenceSpecification -o Reference @@ -6601,38 +6604,37 @@
● -ExecutionSpecification -(abstract)
+ExecutionSpecification (abstract) -o The -concrete types are BehaviorExecutionSpecification and -ActionExecutionSpecification.
+concrete types are BehaviorExecutionSpecification and +ActionExecutionSpecification. -o An -execution specification does not model an event. Instead, it models the -act of some object executing some portion of its behavior specification (e.g., +execution specification does not model an event. Instead, it models the act +of some object executing some portion of its behavior specification (e.g., executing an action or behavior).
-o An execution specification defines start and finish points on the -lifeline, which define its active period, and reference the corresponding -action or behavior that is executing. A start and finish must be +lifeline, which define its active period, and reference the corresponding action +or behavior that is executing. A start and finish must be specified.
-o Messages @@ -6642,13 +6644,13 @@
● Message
-o A @@ -6656,20 +6658,20 @@ asynchronous signal send). The message carries the information about the call and is sent from the invoking object and received by the invoked object.
-o Objects can communicate via messages.
-o Messages have arguments if the called operation has parameters, or attributes if the message sends a signal.
-o Messages @@ -6685,25 +6687,24 @@
● -OccurrenceSpecification -is a newly introduced type that replaces -EventOccurrence.
- -The new specification introduces two new types of OccurrenceSpecification: event occurrence specifications -and message occurrence specifications.
+OccurrenceSpecification is a newly introduced type that replaces EventOccurrence. -The new specification introduces two new types of +OccurrenceSpecification: event occurrence specifications and message +occurrence specifications.
+ +o In order to migrate older event occurrences you can follow this rule of thumb:
-▪ @@ -6711,34 +6712,34 @@ going out of the event occurrence, then it can be replaced with message occurrence specification.
-▪ If there is a spontaneous stop, then you can replace with an occurrence specification and refer to a destruction event.
-o If the event occurrence starts or finishes an independent execution occurrence then it maps to and execution occurrence specification.
-o Occurrence specifications must reference an event.
-o Events could be referenced by multiple occurrence specifications or triggers. Since an event is owned by a -package, this is a convenient way to tie together both statechart -concepts and sequence concepts.
+package, this is a convenient way to tie together both statechart concepts and +sequence concepts. -o
Differing messages that refer to the same
@@ -6750,49 +6751,46 @@
●
-The Stop metaclass has been removed from the latest version.
o -Stop used to be a specialization of EventOccurrence. Now, stops should be replaced -by creating either an occurrence specification or a message occurrence -specification that references a destruction event.
+Stop used to be a specialization of +EventOccurrence. Now, stops should be replaced by creating either +an occurrence specification or a message occurrence specification that +references a destruction event.● -ExecutionOccurrence -(older)
+ExecutionOccurrence (older) -o Mapped -to either an action exection specification -that references an action, or a behavior exection -specification that refers to a behavior (more general).
+to either an action exection specification that references an action, or +a behavior exection specification that refers to a behavior (more +general).● -EventOccurrence -(older)
+EventOccurrence (older) -o In @@ -6802,13 +6800,13 @@
● Message
-o A @@ -6820,7 +6818,7 @@ referenced by the message occurrence specification. Those events can refer to operations or signals from which the signature is derived.
-o
If an operation is not present, it is derived
@@ -6829,23 +6827,22 @@
●
-MessageSort
o -The synchSignal -literal has been removed.
+The synchSignal literal has been removed. -o -The createMessage, deleteMessage and reply literals are new.
+The createMessage, deleteMessage and reply +literals are new.-
UML 2.0 separated the concepts of navigability from association -end ownership. In UML 2.1, a new “black dot” notation has been introduced -where it is desired to make ownership explicit.
+UML 2.0 separated the concepts of navigability from +association end ownership. In UML 2.1, a new “black dot” notation has +been introduced where it is desired to make ownership explicit.
Diagrams showing associations now can display three -distinct concepts: aggregation type, ownership and navigability. These -three notions could all potentially be combined at once in the display of an -association.
+distinct concepts: aggregation type, ownership and navigability. +These three notions could all potentially be combined at once in the display of +an association.The Superstructure specification refers to some presentation options that might be implemented including suppression of some @@ -6872,14 +6869,13 @@
In the diagram below:
-● -endA -is owned by classifier B and endB is owned by BinaryAssociationAB.
+endA is owned by +classifier B and endB is owned by BinaryAssociationAB. -●
The absence of a dot signifies ownership by the
@@ -6889,7 +6885,7 @@
-
In addition, older TimeObservationAction -and DurationObservationAction have been replaced by -opaque actions. The “now” and “duration” fields in these old metaclasses have been replaced by value pins as input -values that refer to time expressions and durations (both of which are value -specifications).
+In addition, older TimeObservationAction and +DurationObservationAction have been replaced by opaque actions. The +“now” and “duration” fields in these old metaclasses have been replaced by +value pins as input values that refer to time expressions and durations (both +of which are value specifications).
@@ -6939,7 +6933,7 @@
-
@@ -6953,7 +6947,7 @@
-
● @@ -6964,16 +6958,15 @@ tab-stops:list 1.0in'>o The -ProfileApplication meta-type no longer extends -PackageImport. It now directly extends DirectedRelationship.
+ProfileApplication meta-type no longer extends PackageImport. It +now directly extends DirectedRelationship.o The -structural feature ProfileApplication::importedProfile -has been renamed to ProfileApplication::appliedProfile.
+structural feature ProfileApplication::importedProfile has been renamed to +ProfileApplication::appliedProfile.●
@@ -7044,8 +7037,8 @@
7328 Message Sort
o MessageSort::synchSignal mapped to MessageSort::asynchSignal
o A @@ -7055,7 +7048,7 @@
o EventOccurrence::getFinishExecs and getStartExecs -list changed to scalar
+style='font-size:7.0pt'> EventOccurrence::getFinishExecs +and getStartExecs list changed to scalaro Additional @@ -7074,46 +7066,44 @@
o The -corresponding property is ExecutionOccurrenceSpecification::execution -which is a kind of ExecutionSpecification.
+corresponding property is ExecutionOccurrenceSpecification::execution which is +a kind of ExecutionSpecification.o The multiplicity changed from * to 1 because the semantics changed somewhat. That is in UML2 2.0 even if two execution specifications start at the same time, they have individual start events. Therefore, when converting older -models in which one EventOccurrence had more than one -ExecutionOccrrence (if there are such), it is -necessary to create multiple copies of the ExecutionOccurrenceSpecification -( corresponding to the UML2 1.x) EventOccurrence, -so that each ExecutionSpecification can have its own -start event.
+models in which one EventOccurrence had more than one ExecutionOccrrence (if +there are such), it is necessary to create multiple copies of the ExecutionOccurrenceSpecification +( corresponding to the UML2 1.x) EventOccurrence, so +that each ExecutionSpecification can have its own start event.
o ExecutionOccurrence::getBehaviors list changed to scalar
+style='font-size:7.0pt'> ExecutionOccurrence::getBehaviors +list changed to scalaro In UML2 1.x this was the specification of the Behavior that, when executed, caused -the ExecutionOccurrence. In UML2 2.0 ExecutionOccurrence was replaced by ExecutionSpecification. -Furthermore, action executions (ActionExecutionSpecification) -were differentiated from other types of executions (BehaviorExecutionSpecification). -Since the UML2 1.x model did not support the former case, this will never occur -when converting a UML2 1.x model. So the corresponding feature is BehaviorExecutionSpecification::behavior.
+the ExecutionOccurrence. In UML2 2.0 ExecutionOccurrence was replaced by +ExecutionSpecification. Furthermore, action executions +(ActionExecutionSpecification) were differentiated from other types of +executions (BehaviorExecutionSpecification). Since the UML2 1.x model did +not support the former case, this will never occur when converting a UML2 1.x +model. So the corresponding feature is +BehaviorExecutionSpecification::behavior.@@ -7131,9 +7121,8 @@ 8318, 8894
o Interval::getMaxes and getMins -list changed to scalar
+style='font-size:7.0pt'> Interval::getMaxes +and getMins list changed to scalaro This @@ -7143,7 +7132,7 @@
o PrimitiveFunction::getBody and getLanguage -scalar changed to list
+style='font-size:7.0pt'> PrimitiveFunction::getBody +and getLanguage scalar changed to listo Activity::getBody and getLanguage -scalar changed to list
+style='font-size:7.0pt'> Activity::getBody +and getLanguage scalar changed to listo OpaqueExpression::getLanguage and getBody -scalar changed to list
+style='font-size:7.0pt'> OpaqueExpression::getLanguage +and getBody scalar changed to listo Latest @@ -7189,7 +7175,7 @@
o AnyTrigger, CallTrigger, TimeTrigger, ChangeTrigger, MessageTrigger, SignalTrigger -mapped to concrete Trigger. That new trigger refers to the corresponding -Event.
+style='font-size:7.0pt'> AnyTrigger, +CallTrigger, TimeTrigger, ChangeTrigger, MessageTrigger, SignalTrigger mapped +to concrete Trigger. That new trigger refers to the corresponding Event.o Trigger @@ -7220,8 +7203,8 @@
o An -event is an instantaneous thing. An EventOccurrenceSpecification -is an instance of an event.
+event is an instantaneous thing. An EventOccurrenceSpecification is an +instance of an event.o An @@ -7257,23 +7240,22 @@
o DurationObservationAction, TimeObservationAction -are mapped to OpaqueAction.
+style='font-size:7.0pt'> DurationObservationAction, +TimeObservationAction are mapped to OpaqueAction.
o Issue @@ -7289,32 +7271,31 @@
o Now -a ProfileApplication is a subclass of DirectedRelationship rather than PackageImport.
+a ProfileApplication is a subclass of DirectedRelationship rather than +PackageImport.
o Issue 7319, 7365
o ApplyFunctionAction::getArguments, getFunction, -getResults unmapped.
+style='font-size:7.0pt'> ApplyFunctionAction::getArguments, +getFunction, getResults unmapped.o ApplyFunctionAction mapped to CallBehaviorAction.
+style='font-size:7.0pt'> ApplyFunctionAction +mapped to CallBehaviorAction.@@ -7325,12 +7306,11 @@ mso-bidi-font-weight:bold'>● Issue -7421 TemplateSignature +7421 TemplateSignature
o TemplateSignature::getNestedSignatures and getNestingSignature unmapped
+style='font-size:7.0pt'> TemplateSignature::getNestedSignatures +and getNestingSignature unmappedo This @@ -7353,7 +7333,7 @@
-
●
@@ -7364,7 +7344,7 @@
●
@@ -7380,27 +7360,26 @@
●
Package Literals o New
package literals have been introduced for accessing metadata. o More
-efficient to use package literals instead of metadata accessor
-methods, e.g. use UMLPackage.Literals.PACKAGE__PACKAGED_ELEMENT
-instead of UMLPackage.eINSTANCE.getPackage_PackagedElement().
▪ void merge(org.eclipse.uml2.uml.Package package_, Map options) ;
▪ -void merge(org.eclipse.uml2.uml.Package package_,Map options, DiagnosticChain -diagnostics, Map context)
+void merge(org.eclipse.uml2.uml.Package +package_,Map options, DiagnosticChain diagnostics, Map context)o UMLUtil -implements a nested inner class that can be overridden for application-specific -merge.
+style='font-family:"Courier New"'>UMLUtil implements a nested inner +class that can be overridden for application-specific merge.▪ -Association between stereotype and metaclass (which introduces property on stereotype).
+Association between stereotype and metaclass +(which introduces property on stereotype).▪ -Image is a new metaclass.
+Image is a new metaclass.▪ Image part of stereotype definition.
▪ Introduces notational changes.
▪ Can now have multiple images per stereotype
@@ -7526,34 +7503,33 @@ of stereotype applications.▪ Will no longer be in an annotation on an element.
▪ Will be added to the resource and will reference the elements to which they are applied
▪ Listeners will be affected.
▪ When stereotypes are applied with ‘applyStereotype(…)’ -the object representing that particular stereotype application will be -returned.
+class=GramE>‘applyStereotype(…)’ the object representing that +particular stereotype application will be returned.▪ Will now use only one standard profile (called “Standard.profile.uml”) -which is L3 compliant
+style='font-family:"Courier New"'>Standard.profile.uml”) which is L3 +compliant@@ -7583,38 +7559,37 @@
-
● Support for loading and saving in “official” OMG format. The UML editor now supports -saving with .xmi extension. Simply select -the “File > Save As...” and specify a .xmi extension.
+saving with .xmi extension. Simply select the “File > +Save As...” and specify a +.xmi extension.● The difference -between the .xmi format and the .uml is that annotations -are not a legal part of the UML schema. When saving your existing .uml -model to the .xmi format, annotations will be converted to XMI extensions.
+between the .xmi format and the .uml is that annotations are not a legal part +of the UML schema. When saving your existing .uml model to the +.xmi format, annotations will be converted to +XMI extensions.● Opening a model -with .xmi format with the UML editor will work and properly render using the UML -API.
+with .xmi format with the UML editor will +work and properly render using the UML API.@@ -7623,7 +7598,7 @@
-
●
@@ -7640,57 +7615,54 @@
●
Retrieval of
derived collections made more efficient. o Derived
-collections now use a “smart” iterator.
▪ The result is that sequentially moving through collections using an indexed approach is very inefficient.
▪ -For a derived collection, getSize() is O(n)
+For a derived collection, getSize() is O(n)▪ The list does not hold onto all the elements at once. Memory price is paid only when the list is traversed.
-o Always -use an iterator when moving through derived -collections obtained from UML2 API.
+use an iterator when moving through derived collections obtained from UML2 API. -o Index-based iteration need only be avoided for lists returned for features that are derived unions. In general, a way to tell which kind of iteration will be optimal -at runtime is to test instanceof RandomAccess -(see Javadoc for that interface for details).
+at runtime is to test instanceof +RandomAccess (see Javadoc for that interface for details).-
● Support for segregation of UML2 resources into ‘fragments’ -(e.g. *.fragment.uml) with -packages as root elements has been provided.
+(e.g. *.fragment.uml) with packages as root elements has been provided.-
● @@ -7720,7 +7691,7 @@ for containment proxies has been introduced.
-o Enabled on a per-feature basis.
@@ -7742,19 +7713,18 @@ style='font-family:"Courier New";mso-fareast-font-family:"Courier New"'>▪ EMF support for logical resources is to check -definition of each feature and invoke isResolveProxies(). +definition of each feature and invoke isResolveProxies(). +▪ -isResolveProxies is an attribute on every -Ecore reference and must be set to TRUE on containment references for which -proxy support is desired (must be set to TRUE for containment proxies to work)
+isResolveProxies +is an attribute on every Ecore reference and must be set to TRUE on containment +references for which proxy support is desired (must be set to TRUE for +containment proxies to work)@@ -7767,7 +7737,7 @@ un-control in a unit.
-
@@ -7777,7 +7747,7 @@
-
● @@ -7785,19 +7755,18 @@ derived unions that are redefined by subclasses.
-o Cases where derived unions were redefined by non-derived properties have been -removed; as a result, the properties like Package::ownedMember -and Component::ownedMember are now derived and new -modifiable properties named ‘packagedElement’ are -available.
+removed; as a result, the properties like Package::ownedMember and +Component::ownedMember are now derived and new modifiable properties named +‘packagedElement’ are available.●
@@ -7806,7 +7775,7 @@
●
@@ -7815,7 +7784,7 @@
●
@@ -7829,7 +7798,7 @@
●
@@ -7853,10 +7822,8 @@
EList Element#getRelationships()
- EList
+ Element#getRelationships() EList Element#getRelationships(EClass) EList
+ Element#getRelationships(EClass) EList Element#getSourceDirectedRelationships() EList
+ Element#getSourceDirectedRelationships() EList Element#getSourceDirectedRelationships(EClass) EList
+ Element#getSourceDirectedRelationships(EClass) EList Element#getTargetDirectedRelationships() EList
+ Element#getTargetDirectedRelationships() EList Element#getTargetDirectedRelationships(EClass) EList
+ Element#getTargetDirectedRelationships(EClass) Get directed relationships
- of a particular type of which this element is a target. Get directed relationships of
+ a particular type of which this element is a target. ●
@@ -7994,9 +7953,8 @@
@@ -7950,7 +7909,7 @@
-
-
-
-
-
-
-
Operation - Class#createOwnedOperation(String name, EList ownedParameterNames, EList ownedParameterTypes);
+ Class#createOwnedOperation(String name, EList ownedParameterNames, + EList ownedParameterTypes);
Operation - Class#getOwnedOperation(String name, EList ownedParameterNames, EList ownedParameterTypes);
+ Class#getOwnedOperation(String name, EList ownedParameterNames, + EList ownedParameterTypes);
[sample] Get specific - operation based on param types. Passing NULL - is OK.
+ operation based on param types. Passing NULL is OK.Operation - Class#createOwnedOperation(String name, EList parameterNames, EList parameterTypes, Type returnType);
+ Class#createOwnedOperation(String name, EList + parameterNames, EList parameterTypes, Type returnType);
Operation - Class#getOwnedOperation(String name, EList ownedParameterNames,EList - ownedParameterTypes, boolean - ignoreCase, boolean createOnDemand);
+ Class#getOwnedOperation(String name, EList + ownedParameterNames,EList ownedParameterTypes, boolean ignoreCase, boolean + createOnDemand);
Classifier Class#getNestedClassifier Class#getNestedClassifier(String name);
Classifier Class#getNestedClassifier(String name, boolean ignoreCase, EClass eClass, boolean createOnDemand);
+ style='font-size:9.0pt;font-family:"Courier New"'> Class#getNestedClassifier(String name, boolean + ignoreCase, EClass eClass, boolean createOnDemand);
[sample] Getter with potential - to create if not found.
+[sample] Getter with + potential to create if not found.
Classifier Class#createNestedClassifier(String name, EClass eClass);
+ style='font-size:9.0pt;font-family:"Courier New"'> Class#createNestedClassifier(String name, EClass + eClass);
PackageableElement Package#getPackagedElement(String - name, boolean ignoreCase, - EClass eClass, boolean createOnDemand);
+PackageableElement + Package#getPackagedElement(String name, boolean ignoreCase, EClass + eClass, boolean createOnDemand);
PackageableElement Package#getPackagedElement(String - name);
+PackageableElement + Package#getPackagedElement(String name);
PackageableElement Package#createPackagedElement(String - name, EClass eClass);
+PackageableElement + Package#createPackagedElement(String name, EClass eClass);
[sample] Creation with EClass specified.
+[sample] Creation with + EClass specified.
Port - EncapsulatedClassifier#createOwnedPort(String - name, Type type);
+ EncapsulatedClassifier#createOwnedPort(String name, Type type);
Port - EncapsulatedClassifier#getOwnedPort(String - name, Type type, boolean ignoreCase, boolean createOnDemand);
+ EncapsulatedClassifier#getOwnedPort(String name, Type type, boolean + ignoreCase, boolean createOnDemand);
Port - EncapsulatedClassifier#getOwnedPort(String - name, Type type);
+ EncapsulatedClassifier#getOwnedPort(String name, Type type);-
● Enhanced -UMLUtil methods.
+UMLUtil methods.@@ -8255,10 +8194,8 @@
Collection - UMLUtil#findNamedElements(Resource resource, String qualifiedName, - boolean ignoreCase, EClass eClass)
+ UMLUtil#findNamedElements(Resource resource, String qualifiedName, boolean + ignoreCase, EClass eClass)
Collection - UMLUtil#findNamedElements(Resource resource, String qualifiedName)
+ UMLUtil#findNamedElements(Resource resource, String qualifiedName)
EObject UMLUtil#safeApplyStereotype(Element - element, Stereotype stereotype)
+EObject + UMLUtil#safeApplyStereotype(Element element, Stereotype + stereotype)
Will apply profile to outermost - package if not already applied. All efforts are made to safely - apply stereotype.
+Will apply profile to + outermost package if not already applied. All efforts are made to + safely apply stereotype.
o -UMLUtil -now defines a merge(…) function -that performs a package merge as defined by the Superstructure specification
+UMLUtil now defines a merge(…) function that performs a +package merge as defined by the Superstructure specification@@ -8349,8 +8283,7 @@
void - UMLUtil#merge(org.eclipse.uml2.uml.Package - package_, Map options)
+ UMLUtil#merge(org.eclipse.uml2.uml.Package package_, Map options)
@@ -8387,9 +8320,8 @@
EList Classifier#getAllAttributes()
+EList + Classifier#getAllAttributes()
EList Classifier#getAttributes()
+EList + Classifier#getAttributes()
EList Classifier#getAllOperations()
+EList + Classifier#getAllOperations()
EList Classifier#getOperations()
+EList + Classifier#getOperations()
PackageImport Profile#createMetamodelReference(org.eclipse.uml2.uml.Package - importedPackage)
+PackageImport + Profile#createMetamodelReference(org.eclipse.uml2.uml.Package + importedPackage)
ElementImport createMetaclassReference(PackageableElement importedElement)
+ElementImport + createMetaclassReference(PackageableElement importedElement)
Stereotype - createOwnedStereotype(String name, boolean isAbstract);
+ createOwnedStereotype(String name, boolean isAbstract);
boolean isDefined();
+boolean + isDefined();
o Result is that OCL engine can now use custom operations
▪ e.g. Check for applied stereotypes.
-o Lists vs. Sets
▪ Custom operations in source models used to -return sets, now they return EList +return sets, now they return EList
-
-
● -Javadoc based on the -Superstructure specification has been included.
+Javadoc based +on the Superstructure specification has +been included.@@ -8588,14 +8511,14 @@
-
● Icons added for each of the types -defined by UML (instead of the default generated added for each of the +types defined by UML (instead of the default generated by EMF).
@@ -8617,7 +8540,7 @@
-
@@ -8651,13 +8574,13 @@
-i. -From the Ecore editor, on an Ecore package, select the “Convert to UML -model…” option.
+i. From +the Ecore editor, on an Ecore package, select the “Convert to UML model…” +option.
@@ -8684,17 +8607,15 @@
-
@@ -8716,8 +8637,7 @@
-
Collection - UMLUtil#convertFromEcore(EPackage - ePackage, Map options)
+ UMLUtil#convertFromEcore(EPackage ePackage, Map options)
UMLUtil#convertToEcore(org.eclipse.uml2.Package package_,Map options)
+UMLUtil#convertToEcore(org.eclipse.uml2.Package + package_,Map options)
● In addition, all applied profiles will automatically be migrated.
-●
@@ -8800,7 +8718,7 @@
- ●
@@ -8827,7 +8745,7 @@
●
@@ -8836,7 +8754,7 @@
●
@@ -8845,7 +8763,7 @@
●
@@ -8857,11 +8775,11 @@
It is possible to stereotype a profile as an EPackage. ●
@@ -8875,17 +8793,17 @@
●
-Stereotype
-applications are now stored at the resource level instead of as annotations on
-the elements themselves. ●
@@ -8899,55 +8817,52 @@
●
The current UML
API implements a versioning format that conforms to the latest UML
-specification and uses existing nsURI naming
-conventions. ●
In the old
-schema, version information was stored as a prefix and in the nsURI. This was somewhat redundant.
- <contents xmi:type="ecore:EPackage" xmi:id="_6hd4tLRJEdqcc7lEDGpkMw"
-name="ProfileOne_0"
- nsURI="http:///ProfileOne_0_6hd4s7RJEdqcc7lEDGpkMw.profile.uml2" nsPrefix="ProfileOne_0"> ●
In the new
-schema, version information is stored explicitly in the nsURI <contents xmi:type="ecore:EPackage"
-xmi:id="_wRtnIOwjEdqsq-xx51kbkg"
-name="ProfileOne" nsURI="http:///schemas/ProfileOne/1" nsPrefix="ProfileOne">
@@ -8959,10 +8874,10 @@
-
Users can simply migrate the profiles -on their own, but profiles don’t exist in a vacuum. Profiles are applied -to models. It is therefore expected that you will want to migrate the -models on which the profile is applied at the same time as the profile is +
Users can simply migrate the +profiles on their own, but profiles don’t exist in a vacuum. Profiles are +applied to models. It is therefore expected that you will want to migrate +the models on which the profile is applied at the same time as the profile is migrated. The various usecases are outlined below.
@@ -8976,11 +8891,11 @@
-
@@ -9041,102 +8956,97 @@ encoding="UTF-8"?>
<uml:Model -xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xmlns:Basic_0="http:///Basic_0.profile.uml2" xmlns:uml="http://www.eclipse.org/uml2/1.0.0/UML" -xsi:schemaLocation="http:///Basic_0.profile.uml2 -pathmap://UML2_PROFILES/Basic.profile.uml2#__LeIQK86Edih9-GG5afQ0g" xmi:id="_y8utoOv8Edqsq-xx51kbkg" appliedProfile="_DKmYgOv_Edqsq-xx51kbkg +font-family:"Courier New"'><uml:Model +xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Basic_0="http:///Basic_0.profile.uml2" +xmlns:uml="http://www.eclipse.org/uml2/1.0.0/UML" +xsi:schemaLocation="http:///Basic_0.profile.uml2 +pathmap://UML2_PROFILES/Basic.profile.uml2#__LeIQK86Edih9-GG5afQ0g" +xmi:id="_y8utoOv8Edqsq-xx51kbkg" appliedProfile="_DKmYgOv_Edqsq-xx51kbkg _dmLfcOv_Edqsq-xx51kbkg">
<packageImport xmi:type="uml:ProfileApplication" -xmi:id="_DKmYgOv_Edqsq-xx51kbkg">
+font-family:"Courier New"'> <packageImport xmi:type="uml:ProfileApplication" +xmi:id="_DKmYgOv_Edqsq-xx51kbkg"><eAnnotations -xmi:id="_DKmYgev_Edqsq-xx51kbkg" +font-family:"Courier New"'> <eAnnotations xmi:id="_DKmYgev_Edqsq-xx51kbkg" source="attributes">
<details xmi:id="_DKmYguv_Edqsq-xx51kbkg" -key="version" value="0"/>
+font-family:"Courier New"'> <details xmi:id="_DKmYguv_Edqsq-xx51kbkg" key="version" +value="0"/></eAnnotations>
+font-family:"Courier New"'> </eAnnotations><importedPackage +class=GramE>importedPackage href="pathmap://UML2_PROFILES/Complete.profile.uml2#_M7pTkK87Edih9-GG5afQ0g"/>
<importedProfile +class=GramE>importedProfile href="pathmap://UML2_PROFILES/Complete.profile.uml2#_M7pTkK87Edih9-GG5afQ0g"/>
</packageImport>
+font-family:"Courier New"'> </packageImport><packageImport xmi:type="uml:ProfileApplication" -xmi:id="_dmLfcOv_Edqsq-xx51kbkg">
+font-family:"Courier New"'> <packageImport xmi:type="uml:ProfileApplication" +xmi:id="_dmLfcOv_Edqsq-xx51kbkg"><eAnnotations -xmi:id="_dmLfcev_Edqsq-xx51kbkg" +font-family:"Courier New"'> <eAnnotations xmi:id="_dmLfcev_Edqsq-xx51kbkg" source="attributes">
<details xmi:id="_dmLfcuv_Edqsq-xx51kbkg" +font-family:"Courier New"'> <details xmi:id="_dmLfcuv_Edqsq-xx51kbkg" key="version" value="0"/>
</eAnnotations>
+font-family:"Courier New"'> </eAnnotations><importedPackage +class=GramE>importedPackage href="pathmap://UML2_PROFILES/Basic.profile.uml2#_6mFRgK86Edih9-GG5afQ0g"/>
<importedProfile +class=GramE>importedProfile href="pathmap://UML2_PROFILES/Basic.profile.uml2#_6mFRgK86Edih9-GG5afQ0g"/>
</packageImport>
+font-family:"Courier New";background:yellow'> </packageImport><ownedMember xmi:type="uml:Artifact" -xmi:id="_md9YcOv_Edqsq-xx51kbkg" -name="artifact">
+font-family:"Courier New"'> <ownedMember xmi:type="uml:Artifact" +xmi:id="_md9YcOv_Edqsq-xx51kbkg" name="artifact"><eAnnotations -xmi:id="_o4MmQOv_Edqsq-xx51kbkg" -source="appliedStereotypes">
+font-family:"Courier New"'> <eAnnotations xmi:id="_o4MmQOv_Edqsq-xx51kbkg" +source="appliedStereotypes"><contents xmi:type="Basic_0:Basic__Script" -xmi:id="_o4MmQev_Edqsq-xx51kbkg"/>
+font-family:"Courier New"'> <contents xmi:type="Basic_0:Basic__Script" +xmi:id="_o4MmQev_Edqsq-xx51kbkg"/></eAnnotations>
+font-family:"Courier New"'> </eAnnotations></ownedMember>
+font-family:"Courier New"'> </ownedMember></uml:Model>
+font-family:"Courier New"'></uml:Model>@@ -9152,66 +9062,61 @@ encoding="UTF-8"?>
<xmi:XMI -xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xmlns:Standard="http://www.eclipse.org/uml2/schemas/Standard/1" -xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" -xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" +font-family:"Courier New"'><xmi:XMI xmi:version="2.1" +xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xmlns:Standard="http://www.eclipse.org/uml2/schemas/Standard/1" +xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" +xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Standard/1 pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w">
<uml:Model -xmi:id="_y8utoOv8Edqsq-xx51kbkg">
+font-family:"Courier New"'> <uml:Model +xmi:id="_y8utoOv8Edqsq-xx51kbkg"><packagedElement -xmi:type="uml:Artifact" xmi:id="_md9YcOv_Edqsq-xx51kbkg" -name="artifact"/>
+font-family:"Courier New"'> <packagedElement xmi:type="uml:Artifact" +xmi:id="_md9YcOv_Edqsq-xx51kbkg" name="artifact"/><profileApplication -xmi:type="uml:ProfileApplication" xmi:id="_3vnrsOw6Edqsq-xx51kbkg">
+font-family:"Courier New"'> <profileApplication xmi:type="uml:ProfileApplication" +xmi:id="_3vnrsOw6Edqsq-xx51kbkg"><eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3vnrsew6Edqsq-xx51kbkg" -source="http://www.eclipse.org/uml2/2.0.0/UML">
+font-family:"Courier New"'> <eAnnotations xmi:type="ecore:EAnnotation" +xmi:id="_3vnrsew6Edqsq-xx51kbkg" source="http://www.eclipse.org/uml2/2.0.0/UML">-<references xmi:type="ecore:EPackage" +<references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w"/>
</eAnnotations>
+font-family:"Courier New"'> </eAnnotations><appliedProfile xmi:type="uml:Profile" -href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
+style='background:yellow'><appliedProfile xmi:type="uml:Profile" +href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/></profileApplication>
+font-family:"Courier New";background:yellow'> +</profileApplication></uml:Model>
+font-family:"Courier New"'> </uml:Model><Standard:Script xmi:id="_3vnrsuw6Edqsq-xx51kbkg" -base_Artifact="_md9YcOv_Edqsq-xx51kbkg"/>
+font-family:"Courier New"'> <Standard:Script +xmi:id="_3vnrsuw6Edqsq-xx51kbkg" +base_Artifact="_md9YcOv_Edqsq-xx51kbkg"/></xmi:XMI>
+font-family:"Courier New"'></xmi:XMI>@@ -9236,19 +9141,19 @@ > Apply Profile”.
-
@@ -9274,90 +9179,85 @@ encoding="UTF-8"?>
<uml:Model -xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +font-family:"Courier New"'><uml:Model +xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ProfileOne_0="http:///ProfileOne_0_6hd4s7RJEdqcc7lEDGpkMw.profile.uml2" -xmlns:uml="http://www.eclipse.org/uml2/1.0.0/UML" +xmlns:uml="http://www.eclipse.org/uml2/1.0.0/UML" xsi:schemaLocation="http:///ProfileOne_0_6hd4s7RJEdqcc7lEDGpkMw.profile.uml2 -MyProfile.uml2#_6hd4tLRJEdqcc7lEDGpkMw" xmi:id="_HF4i4LRHEdqcc7lEDGpkMw" -appliedProfile="_EMDHoLRKEdqcc7lEDGpkMw">
+MyProfile.uml2#_6hd4tLRJEdqcc7lEDGpkMw" +xmi:id="_HF4i4LRHEdqcc7lEDGpkMw" +appliedProfile="_EMDHoLRKEdqcc7lEDGpkMw"><packageImport xmi:type="uml:ProfileApplication" -xmi:id="_EMDHoLRKEdqcc7lEDGpkMw">
+font-family:"Courier New"'> <packageImport xmi:type="uml:ProfileApplication" +xmi:id="_EMDHoLRKEdqcc7lEDGpkMw"><eAnnotations -xmi:id="_EMDHobRKEdqcc7lEDGpkMw" -source="attributes">
+font-family:"Courier New"'> <eAnnotations xmi:id="_EMDHobRKEdqcc7lEDGpkMw" source="attributes"><details xmi:id="_EMDHorRKEdqcc7lEDGpkMw" +font-family:"Courier New"'> <details xmi:id="_EMDHorRKEdqcc7lEDGpkMw" key="version" value="0"/>
</eAnnotations>
+font-family:"Courier New"'> </eAnnotations><importedPackage -xmi:type="uml:Profile" href="MyProfile.uml2#_NLpAMLRHEdqcc7lEDGpkMw"/>
+font-family:"Courier New"'> <importedPackage xmi:type="uml:Profile" +href="MyProfile.uml2#_NLpAMLRHEdqcc7lEDGpkMw"/><importedProfile -href="MyProfile.uml2#_NLpAMLRHEdqcc7lEDGpkMw"/>
+font-family:"Courier New"'> <importedProfile +href="MyProfile.uml2#_NLpAMLRHEdqcc7lEDGpkMw"/></packageImport>
+font-family:"Courier New"'> </packageImport><ownedMember xmi:type="uml:Class" xmi:id="_H44GELRHEdqcc7lEDGpkMw" -name="MyClass">
+font-family:"Courier New"'> <ownedMember +xmi:type="uml:Class" +xmi:id="_H44GELRHEdqcc7lEDGpkMw" name="MyClass"><eAnnotations xmi:id="_HyseMLRKEdqcc7lEDGpkMw" -source="appliedStereotypes">
+font-family:"Courier New";background:yellow'> +<eAnnotations xmi:id="_HyseMLRKEdqcc7lEDGpkMw" +source="appliedStereotypes">-<contents xmi:type="ProfileOne_0:ProfileOne__StereotypeOne" -xmi:id="_HyseMbRKEdqcc7lEDGpkMw" MyProperty="4"/>
+<contents xmi:type="ProfileOne_0:ProfileOne__StereotypeOne" +xmi:id="_HyseMbRKEdqcc7lEDGpkMw" MyProperty="4"/></eAnnotations>
+font-family:"Courier New";background:yellow'> +</eAnnotations><ownedAttribute -xmi:id="_b9cgQLRKEdqcc7lEDGpkMw" -name="PropertyOne"/>
+font-family:"Courier New"'> <ownedAttribute xmi:id="_b9cgQLRKEdqcc7lEDGpkMw" +name="PropertyOne"/></ownedMember>
+font-family:"Courier New"'> </ownedMember><ownedMember xmi:type="uml:Actor" -xmi:id="_ERmhcLqqEdqSyLEgG4orvQ" -name="Actor">
+font-family:"Courier New"'> <ownedMember xmi:type="uml:Actor" +xmi:id="_ERmhcLqqEdqSyLEgG4orvQ" name="Actor"><eAnnotations -xmi:id="_ICL3ILqqEdqSyLEgG4orvQ" +font-family:"Courier New"'> <eAnnotations xmi:id="_ICL3ILqqEdqSyLEgG4orvQ" source="keywords" value="blah"/>
</ownedMember>
+font-family:"Courier New"'> </ownedMember></uml:Model>
+font-family:"Courier New"'></uml:Model>@@ -9371,93 +9271,83 @@ encoding="UTF-8"?>
<xmi:XMI -xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xmlns:ProfileOne="http:///schemas/ProfileOne/1" -xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" -xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" -xsi:schemaLocation="http:///schemas/ProfileOne/1 +font-family:"Courier New"'><xmi:XMI +xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xmlns:ProfileOne="http:///schemas/ProfileOne/1" +xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" +xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xsi:schemaLocation="http:///schemas/ProfileOne/1 MyProfile.uml#_wRtnIOwjEdqsq-xx51kbkg">
<uml:Model -xmi:id="_HF4i4LRHEdqcc7lEDGpkMw">
+font-family:"Courier New"'> <uml:Model +xmi:id="_HF4i4LRHEdqcc7lEDGpkMw"><packagedElement xmi:type="uml:Class" xmi:id="_H44GELRHEdqcc7lEDGpkMw" -name="MyClass">
+font-family:"Courier New"'> <packagedElement +xmi:type="uml:Class" +xmi:id="_H44GELRHEdqcc7lEDGpkMw" name="MyClass">-<ownedAttribute xmi:type="uml:Property" -xmi:id="_b9cgQLRKEdqcc7lEDGpkMw" -name="PropertyOne"/>
+<ownedAttribute xmi:type="uml:Property" +xmi:id="_b9cgQLRKEdqcc7lEDGpkMw" name="PropertyOne"/></packagedElement>
+font-family:"Courier New";background:yellow'> +</packagedElement><packagedElement -xmi:type="uml:Actor" xmi:id="_ERmhcLqqEdqSyLEgG4orvQ" -name="Actor">
+font-family:"Courier New"'> <packagedElement xmi:type="uml:Actor" +xmi:id="_ERmhcLqqEdqSyLEgG4orvQ" name="Actor"><eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ICL3ILqqEdqSyLEgG4orvQ" -source="http://www.eclipse.org/uml2/2.0.0/UML" +font-family:"Courier New"'> <eAnnotations xmi:type="ecore:EAnnotation" +xmi:id="_ICL3ILqqEdqSyLEgG4orvQ" source="http://www.eclipse.org/uml2/2.0.0/UML" value="blah"/>
</packagedElement>
+font-family:"Courier New"'> </packagedElement><profileApplication xmi:type="uml:ProfileApplication" xmi:id="_EMDHoLRKEdqcc7lEDGpkMw">
+font-family:"Courier New"'> <profileApplication +xmi:type="uml:ProfileApplication" +xmi:id="_EMDHoLRKEdqcc7lEDGpkMw">-<eAnnotations xmi:type="ecore:EAnnotation" -xmi:id="_EMDHobRKEdqcc7lEDGpkMw" -source="http://www.eclipse.org/uml2/2.0.0/UML">
+<eAnnotations xmi:type="ecore:EAnnotation" +xmi:id="_EMDHobRKEdqcc7lEDGpkMw" source="http://www.eclipse.org/uml2/2.0.0/UML">-<references xmi:type="ecore:EPackage" href="MyProfile.uml#_wRtnIOwjEdqsq-xx51kbkg"/>
+<references xmi:type="ecore:EPackage" +href="MyProfile.uml#_wRtnIOwjEdqsq-xx51kbkg"/>-</eAnnotations>
+</eAnnotations>-<appliedProfile xmi:type="uml:Profile" -href="MyProfile.uml#_NLpAMLRHEdqcc7lEDGpkMw"/>
+<appliedProfile xmi:type="uml:Profile" +href="MyProfile.uml#_NLpAMLRHEdqcc7lEDGpkMw"/></profileApplication>
+font-family:"Courier New";background:yellow'> </profileApplication></uml:Model>
+font-family:"Courier New"'> </uml:Model><ProfileOne:StereotypeOne xmi:id="_AjMRkOwkEdqsq-xx51kbkg" -MyProperty="4" base_Class="_H44GELRHEdqcc7lEDGpkMw"/>
+font-family:"Courier New"'> <ProfileOne:StereotypeOne +xmi:id="_AjMRkOwkEdqsq-xx51kbkg" MyProperty="4" +base_Class="_H44GELRHEdqcc7lEDGpkMw"/></xmi:XMI>
+font-family:"Courier New"'></xmi:XMI>@@ -9469,23 +9359,23 @@
-i. -An in memory version of your model will be created
+i. An +in memory version of your model will be created@@ -9500,7 +9390,7 @@ likely not what you want)
-
@@ -9516,7 +9406,7 @@
-
-
-
-
-
-
@@ -9637,6 +9526,351 @@
+
In order to migrate models programmatically, some setup is +required in order to register mappings (already defined by UML). These mappings will be used by the resource +set during the loading stage and will perform the necessary in-memory migration.
+ +The example below demonstrates how one can migrate models with a stand-alone application.
+ +Let’s first start with our main method.
+ +public static void main(String[] args) {
if (args.length != 2) {
System.out
.println("Wrong number of arguments.\nFirst argument is path " +
"of file to migrate ie. C:/myModel.uml2, \nSecond " +
"argument is workspace path " +
"ie. C:/workspace/myWorkspace/");
return;
}
String fileToMigrate = args[0];
String workspacePath = args[1];