Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2012-09-17 13:28:15 +0000
committercletavernie2012-09-17 13:28:15 +0000
commitb00718aa2138c1ce5a34eb592d91d178a9803f8e (patch)
tree7bb9144a6f21f862334f6a495f809b122ca99fbd /extraplugins/marte
parentbd209383ecf3ad359021d1c9e8633201afc36f17 (diff)
downloadorg.eclipse.papyrus-b00718aa2138c1ce5a34eb592d91d178a9803f8e.tar.gz
org.eclipse.papyrus-b00718aa2138c1ce5a34eb592d91d178a9803f8e.tar.xz
org.eclipse.papyrus-b00718aa2138c1ce5a34eb592d91d178a9803f8e.zip
380517: [Papyrus] We should use explicit plug-in dependencies whenever possible
https://bugs.eclipse.org/bugs/show_bug.cgi?id=380517 + removed some unused dependencies and imports
Diffstat (limited to 'extraplugins/marte')
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation30
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml1826
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.notation2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml540
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GQAMPackage.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaAnalysisContext.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaCommHost.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaEventTrace.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaExecHost.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaResourcesPlatform.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaScenario.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaStep.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaTimedObs.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadBehavior.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadEvent.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadGenerator.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMFactoryImpl.java24
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAcqStepImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAnalysisContextImpl.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommChannelImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommHostImpl.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommStepImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaEventTraceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaExecHostImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaLatencyObsImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRelStepImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRequestedServiceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaResourcesPlatformImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaScenarioImpl.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaStepImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaTimedObsImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadBehaviorImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadEventImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadGeneratorImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMAdapterFactory.java27
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMSwitch.java25
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PAMPackage.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaResPassStep.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaRunTInstance.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaStep.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMFactoryImpl.java12
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaCommStepImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaLogicalResourceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRequestedStepImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaResPassStepImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRunTInstanceImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaStepImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMAdapterFactory.java14
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMSwitch.java12
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SAMPackage.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaCommStep.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaEndtoEndFlow.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSchedObs.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSharedResource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaStep.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMFactoryImpl.java15
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaAnalysisContextImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommHostImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommStepImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaEndtoEndFlowImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaExecHostImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSchedObsImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSharedResourceImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaStepImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMAdapterFactory.java19
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMSwitch.java17
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/LinkTopology.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/RSMPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/Shaped.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DefaultLinkImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DistributeImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/InterRepetitionImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/LinkTopologyImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMFactoryImpl.java12
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ReshapeImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ShapedImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/TilerImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMAdapterFactory.java13
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMSwitch.java11
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/BoundedSubtype.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/ChoiceType.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/CollectionType.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/IntervalType.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/TupleType.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/BoundedSubtypeImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/ChoiceTypeImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/CollectionTypeImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesFactoryImpl.java11
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/IntervalTypeImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/TupleTypeImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesAdapterFactory.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesSwitch.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/Operator.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsFactoryImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsPackageImpl.java73
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsAdapterFactory.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsSwitch.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/ExpressionContext.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/Var.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/ExpressionContextImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VarImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesFactoryImpl.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesAdapterFactory.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesSwitch.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerFeature.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerPort.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerSpecification.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataEvent.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataPool.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowPort.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowProperty.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowSpecification.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocatingBehavior.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocationAction.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMTrigger.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerFeatureImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerPortImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerSpecificationImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataEventImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataPoolImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPortImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPropertyImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowSpecificationImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMFactoryImpl.java21
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocatingBehaviorImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocationActionImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMTriggerImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMAdapterFactory.java16
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMSwitch.java14
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/PpUnit.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtAction.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtFeature.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtService.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtSpecification.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtUnit.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMFactoryImpl.java17
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/PpUnitImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtActionImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtFeatureImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtServiceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtSpecificationImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtUnitImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMAdapterFactory.java11
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMSwitch.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralFactoryImpl.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceServiceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralAdapterFactory.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralSwitch.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwEndPoint.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwMedia.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwArbiterImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBridgeImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBusImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationFactoryImpl.java12
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationResourceImpl.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwEndPointImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationAdapterFactory.java13
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationSwitch.java11
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingResource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwPLD.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwProcessor.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwASICImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwBranchPredictorImpl.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingFactoryImpl.java15
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingResourceImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwISAImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwPLDImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwProcessorImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingAdapterFactory.java13
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingSwitch.java11
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevice.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWActuatorImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWSensorImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceFactoryImpl.java11
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDevicePackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwI_OImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwSupportImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceAdapterFactory.java12
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceSwitch.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemory.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwCacheImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwDriveImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryFactoryImpl.java15
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwRAMImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwROMImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryAdapterFactory.java12
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemorySwitch.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwDMA.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwMMU.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManager.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwDMAImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwMMUImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerFactoryImpl.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerImpl.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerAdapterFactory.java11
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerSwitch.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingResource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwClockImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimerImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingFactoryImpl.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingResourceImpl.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingAdapterFactory.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingSwitch.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwComponent.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwComponentImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutFactoryImpl.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutAdapterFactory.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutSwitch.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwCoolingSupplyImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerFactoryImpl.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerSupplyImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerAdapterFactory.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerSwitch.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/DeviceBroker.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/MemoryBroker.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/SW_BrokeringPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/DeviceBrokerImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/MemoryBrokerImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringFactoryImpl.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringAdapterFactory.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringSwitch.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/Alarm.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/EntryPoint.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/InterruptResource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/MemoryPartition.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SW_ConcurrencyPackage.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwConcurrentResource.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwSchedulableResource.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwTimerResource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/AlarmImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/EntryPointImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/InterruptResourceImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/MemoryPartitionImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyFactoryImpl.java13
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwConcurrentResourceImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwSchedulableResourceImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwTimerResourceImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyAdapterFactory.java15
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencySwitch.java13
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/MessageComResource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/NotificationResource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SW_InteractionPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SharedDataComResource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwInteractionResource.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwMutualExclusionResource.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/MessageComResourceImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/NotificationResourceImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionFactoryImpl.java16
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SharedDataComResourceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwCommunicationResourceImpl.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwInteractionResourceImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwMutualExclusionResourceImpl.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwSynchronizationResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionAdapterFactory.java14
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionSwitch.java12
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SW_ResourceCorePackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwAccessService.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwResource.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCoreFactoryImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCorePackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwAccessServiceImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwResourceImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreAdapterFactory.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreSwitch.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocate.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/AllocateActivityGroup.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocated.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Assign.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/NfpRefine.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocFactoryImpl.java16
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateActivityGroupImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocatedImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AssignImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/NfpRefineImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocAdapterFactory.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocSwitch.java8
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Configuration.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Mode.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeBehavior.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeTransition.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ConfigurationImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsFactoryImpl.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeBehaviorImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeTransitionImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsAdapterFactory.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsSwitch.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/CommunicationMedia.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/GrService.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Resource.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/ResourceUsage.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Scheduler.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/AcquireImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ClockResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationEndPointImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationMediaImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ComputingResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ConcurrencyResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/DeviceResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMFactoryImpl.java26
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMPackageImpl.java211
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GrServiceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/MutualExclusionResourceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ProcessingResourceImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ReleaseImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceUsageImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulableResourceImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulerImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SecondarySchedulerImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/StorageResourceImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SynchronizationResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimerResourceImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimingResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMAdapterFactory.java25
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMSwitch.java23
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Dimension.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NFPsPackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Nfp.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpConstraint.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpType.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Unit.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/DimensionImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsFactoryImpl.java12
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsPackageImpl.java72
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpConstraintImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpTypeImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/UnitImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsAdapterFactory.java11
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsSwitch.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/Clock.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/ClockType.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimePackage.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedConstraint.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDomain.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDurationObservation.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedElement.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedInstantObservation.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedValueSpecification.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockConstraintImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockTypeImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimeFactoryImpl.java16
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimePackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedConstraintImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDomainImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDurationObservationImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedElementImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedEventImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedInstantObservationImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedProcessingImpl.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedValueSpecificationImpl.java5
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java17
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java1
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java15
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java3
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEFactoryImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEPackageImpl.java75
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesFactoryImpl.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesFactoryImpl.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesFactoryImpl.java7
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesFactoryImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsFactoryImpl.java15
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryFactoryImpl.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/IdealClockImpl.java2
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryFactoryImpl.java9
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryPackageImpl.java71
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibraryAdapterFactory.java6
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibrarySwitch.java4
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryFactoryImpl.java10
-rw-r--r--extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryPackageImpl.java71
494 files changed, 1982 insertions, 5283 deletions
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation
index cdc96d81486..bfbf7234d81 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
<notation:Diagram xmi:id="_winU0Ji4Ed-m0Oaexd_lJA" type="PapyrusUMLProfileDiagram" name="NewDiagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_xCDp4Ji4Ed-m0Oaexd_lJA" type="2007" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xCDp4pi4Ed-m0Oaexd_lJA" source="ShadowFigure">
@@ -16,7 +16,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_xCDp6pi4Ed-m0Oaexd_lJA"/>
</children>
<element xmi:type="uml:Package" href="MARTE.profile.uml#_u8y4wAPMEdyuUt-4qHuVvQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xCDp4Zi4Ed-m0Oaexd_lJA" x="25" y="25"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xCDp4Zi4Ed-m0Oaexd_lJA" x="18" y="100"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_sd7DALG0Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sd7DArG0Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -40,7 +40,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_sd7DELG0Ed-tmN4hwNCxXQ"/>
</children>
<element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_XYaMIBKYEdyGYuetzx6T5A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sd7DAbG0Ed-tmN4hwNCxXQ" x="275" width="304" height="198"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sd7DAbG0Ed-tmN4hwNCxXQ" x="268" y="75" width="304" height="198"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_8b-bILG0Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8b-bIrG0Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -64,7 +64,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_8b-bMLG0Ed-tmN4hwNCxXQ"/>
</children>
<element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_eXMtwBKZEdyGYuetzx6T5A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8b-bIbG0Ed-tmN4hwNCxXQ" x="878" y="-8" width="266" height="206"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8b-bIbG0Ed-tmN4hwNCxXQ" x="871" y="67" width="266" height="206"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_uFzKULG1Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uFzKUrG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -88,7 +88,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_uFzKYLG1Ed-tmN4hwNCxXQ"/>
</children>
<element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_noixsBD2EdyybZnLxHsjyA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uFzKUbG1Ed-tmN4hwNCxXQ" x="15" y="355"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uFzKUbG1Ed-tmN4hwNCxXQ" x="8" y="430"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_uyLvMLG1Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uyLvMrG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -112,7 +112,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_uyLvQLG1Ed-tmN4hwNCxXQ"/>
</children>
<element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_xRmWoBD2EdyybZnLxHsjyA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uyLvMbG1Ed-tmN4hwNCxXQ" x="210" y="355"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uyLvMbG1Ed-tmN4hwNCxXQ" x="203" y="430"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_wC6-ULG1Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wC6-UrG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -136,7 +136,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_wC6-YLG1Ed-tmN4hwNCxXQ"/>
</children>
<element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_llNagBBSEdyt6tGzWCpUVA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wC6-UbG1Ed-tmN4hwNCxXQ" x="125" y="175"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wC6-UbG1Ed-tmN4hwNCxXQ" x="118" y="250"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_4O8kkLG1Ed-tmN4hwNCxXQ" type="1026" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4O8kkrG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -160,7 +160,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4O8koLG1Ed-tmN4hwNCxXQ"/>
</children>
<element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_i_gjkBBSEdyt6tGzWCpUVA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4O8kkbG1Ed-tmN4hwNCxXQ" x="1210" y="135"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4O8kkbG1Ed-tmN4hwNCxXQ" x="1203" y="210"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_8fiQALG1Ed-tmN4hwNCxXQ" type="1031" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8fiQArG1Ed-tmN4hwNCxXQ" source="ShadowFigure">
@@ -174,7 +174,7 @@
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_8fiQCLG1Ed-tmN4hwNCxXQ" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Event"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8fiQAbG1Ed-tmN4hwNCxXQ" x="1210"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8fiQAbG1Ed-tmN4hwNCxXQ" x="1203" y="75"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_8vZusGqWEeC2YbiYAwBrzg" type="1026" fontName="Segoe UI" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8vi4oGqWEeC2YbiYAwBrzg" source="ShadowFigure">
@@ -202,7 +202,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_8vi4rmqWEeC2YbiYAwBrzg"/>
</children>
<element xmi:type="uml:Stereotype" href="MARTE.profile.uml#_HYVowA-NEdyLh7muGbCqMw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8vZusWqWEeC2YbiYAwBrzg" x="587" y="290"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8vZusWqWEeC2YbiYAwBrzg" x="580" y="365"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_winU0Zi4Ed-m0Oaexd_lJA"/>
<element xmi:type="uml:Profile" href="MARTE.profile.uml#_zaC5cAPHEdyeNfbOYuD9pg"/>
@@ -362,11 +362,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYfY1_fhEd-f4r3MXmUB9g" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pYfY2vfhEd-f4r3MXmUB9g" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYfY2_fhEd-f4r3MXmUB9g" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYfY3PfhEd-f4r3MXmUB9g" key="StereotypeList" value="Standard::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYfY3ffhEd-f4r3MXmUB9g" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYfY3vfhEd-f4r3MXmUB9g" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pYfY3_fhEd-f4r3MXmUB9g" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z83vUNyAEeGCHqEXZYa4NA" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z83vUdyAEeGCHqEXZYa4NA" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z83vUtyAEeGCHqEXZYa4NA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z83vU9yAEeGCHqEXZYa4NA" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z83vVNyAEeGCHqEXZYa4NA" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_pYfY2PfhEd-f4r3MXmUB9g" type="5062"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
index 497d3592a96..11338f8198d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE.profile.uml
@@ -1,5 +1,5 @@
<?xml version="1.0" 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:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+<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:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
<uml:Profile xmi:id="_zaC5cAPHEdyeNfbOYuD9pg" name="MARTE" metaclassReference="_zBwmMAPQEdyme8Xu4jGRhA _zCDhIAPQEdyme8Xu4jGRhA _zCDhIQPQEdyme8Xu4jGRhA _XaGqQA4vEdysTsAUPnp57Q _XaGqQQ4vEdysTsAUPnp57Q _Ry6UsBBSEdyt6tGzWCpUVA _RzEFsBBSEdyt6tGzWCpUVA _RzEFsRBSEdyt6tGzWCpUVA _RzNPoBBSEdyt6tGzWCpUVA _RzXAoBBSEdyt6tGzWCpUVA _RzXAoRBSEdyt6tGzWCpUVA _cTjB4BBSEdyt6tGzWCpUVA _cTjB4RBSEdyt6tGzWCpUVA _cTsy4BBSEdyt6tGzWCpUVA _cTsy4RBSEdyt6tGzWCpUVA _cTsy4hBSEdyt6tGzWCpUVA _Ci6f8BBTEdyt6tGzWCpUVA _Wh8vUBBVEdyt6tGzWCpUVA _ufbqkBGyEdyb1KzJ7GkiGA _uflbkBGyEdyb1KzJ7GkiGA _uflbkRGyEdyb1KzJ7GkiGA _ufulgBGyEdyb1KzJ7GkiGA _uf4WgBGyEdyb1KzJ7GkiGA _uf4WgRGyEdyb1KzJ7GkiGA _ugBgcBGyEdyb1KzJ7GkiGA _22h4YBGyEdyb1KzJ7GkiGA _qClZ4BG0Edyb1KzJ7GkiGA _aWUyABHYEdyWC5IKDhzksw _aWejABHYEdyWC5IKDhzksw _aWns8BHYEdyWC5IKDhzksw _hO5sABHbEdyWC5IKDhzksw _CjjjkBHcEdyWC5IKDhzksw _Xa_sgBHcEdyWC5IKDhzksw _1tsx0BHjEdy7mJMaejUq5Q _1t2i0BHjEdy7mJMaejUq5Q _ptDNgBJeEdy3Td9UhuLFPg _kMRaoBJgEdy3Td9UhuLFPg _DykoEBJjEdypOJGS7WfJjQ _5a2VkBJ-EdyT_7R0WVpWAw">
<eAnnotations xmi:id="_0lmpIZi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML">
<contents xmi:type="ecore:EPackage" xmi:id="_b6zuobG3Ed-tmN4hwNCxXQ" name="MARTE" nsURI="http://www.eclipse.org/papyrus/MARTE/1" nsPrefix="MARTE">
@@ -188,7 +188,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7Zkh7G3Ed-tmN4hwNCxXQ" name="Nfp">
<eAnnotations xmi:id="_b7ZkiLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lCt1AA4vEdysTsAUPnp57Q"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7ZkibG3Ed-tmN4hwNCxXQ" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7Zki7G3Ed-tmN4hwNCxXQ" name="Unit">
@@ -197,7 +197,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7Zkj7G3Ed-tmN4hwNCxXQ" name="convOffset" ordered="false" unique="false" eType="_b_uD0LG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7ZkkbG3Ed-tmN4hwNCxXQ" name="baseUnit" ordered="false" unique="false" eType="_b7Zki7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7Zkk7G3Ed-tmN4hwNCxXQ" name="base_EnumerationLiteral" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//EnumerationLiteral"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//EnumerationLiteral"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b7ZklbG3Ed-tmN4hwNCxXQ" name="MARTE_Library_MARTE_PrimitivesTypes_Real" instanceClassName="java.lang.String">
@@ -209,20 +209,20 @@
<eAnnotations xmi:id="_b7ZkmLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_P9c2AA4wEdysTsAUPnp57Q"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7ZkmbG3Ed-tmN4hwNCxXQ" name="kind" ordered="false" unique="false" eType="_b7ZkgrG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7Zkm7G3Ed-tmN4hwNCxXQ" name="base_Constraint" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Constraint"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Constraint"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7ZknbG3Ed-tmN4hwNCxXQ" name="mode" ordered="false" unique="false" upperBound="-1" eType="_b7sgnrG3Ed-tmN4hwNCxXQ"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7Zko7G3Ed-tmN4hwNCxXQ" name="NfpType" eSuperTypes="_b-riHrG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b7ZkpLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_-Z87EBFFEdyBd9q9NMDXUQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7ZkpbG3Ed-tmN4hwNCxXQ" name="valueAttrib" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7Zkp7G3Ed-tmN4hwNCxXQ" name="unitAttrib" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7ZkqbG3Ed-tmN4hwNCxXQ" name="exprAttrib" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7ZksrG3Ed-tmN4hwNCxXQ" name="Dimension">
@@ -235,7 +235,7 @@
<eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7ZkurG3Ed-tmN4hwNCxXQ" name="base_Enumeration" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Enumeration"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b_uD0LG3Ed-tmN4hwNCxXQ" name="Real" instanceClassName="java.lang.String">
@@ -261,7 +261,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0smpBpi4Ed-m0Oaexd_lJA" name="Nfp">
<eAnnotations xmi:id="_0smpB5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lCt1AA4vEdysTsAUPnp57Q"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpCJi4Ed-m0Oaexd_lJA" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0smpCpi4Ed-m0Oaexd_lJA" name="Unit">
@@ -270,7 +270,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0smpDpi4Ed-m0Oaexd_lJA" name="offsetFactor" ordered="false" unique="false" eType="_4WGfQJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpEJi4Ed-m0Oaexd_lJA" name="baseUnit" ordered="false" unique="false" eType="_0smpCpi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpEpi4Ed-m0Oaexd_lJA" name="base_EnumerationLiteral" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//EnumerationLiteral"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//EnumerationLiteral"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_0smpFJi4Ed-m0Oaexd_lJA" name="MARTE_Library_MARTE_PrimitivesTypes_Real" instanceClassName="MARTE_Library_MARTE_PrimitivesTypes_Real">
@@ -282,20 +282,20 @@
<eAnnotations xmi:id="_0smpF5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_P9c2AA4wEdysTsAUPnp57Q"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0smpGJi4Ed-m0Oaexd_lJA" name="kind" ordered="false" unique="false" eType="_0smpAZi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpGpi4Ed-m0Oaexd_lJA" name="base_Constraint" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Constraint"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Constraint"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpHJi4Ed-m0Oaexd_lJA" name="mode" ordered="false" unique="false" upperBound="-1" eType="_1A3pLpi4Ed-m0Oaexd_lJA"/>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0smpIpi4Ed-m0Oaexd_lJA" name="NfpType" eSuperTypes="_4UxCm5i4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_0smpI5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_-Z87EBFFEdyBd9q9NMDXUQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpJJi4Ed-m0Oaexd_lJA" name="valueAttrib" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpJpi4Ed-m0Oaexd_lJA" name="unitAttrib" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpKJi4Ed-m0Oaexd_lJA" name="exprAttrib" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0smpMZi4Ed-m0Oaexd_lJA" name="Dimension">
@@ -308,7 +308,7 @@
<eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0smpOZi4Ed-m0Oaexd_lJA" name="base_Enumeration" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Enumeration"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_4WGfQJi4Ed-m0Oaexd_lJA" name="Real" instanceClassName="java.lang.String">
@@ -337,23 +337,23 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_xNTikA4vEdysTsAUPnp57Q" name="Unit">
<ownedAttribute xmi:id="_zHCrYA4vEdysTsAUPnp57Q" name="convFactor" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_beo90AnpEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8bPaoA4vEdysTsAUPnp57Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8bFpoA4vEdysTsAUPnp57Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8bPaoA4vEdysTsAUPnp57Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_4R2jYQ4vEdysTsAUPnp57Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_zMkEkA4vEdysTsAUPnp57Q" name="convOffset" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_beo90AnpEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DobaEA4wEdysTsAUPnp57Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DoSQIA4wEdysTsAUPnp57Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DobaEA4wEdysTsAUPnp57Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_BGm9kQ4wEdysTsAUPnp57Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_zReZwA4vEdysTsAUPnp57Q" name="baseUnit" visibility="public" type="_xNTikA4vEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ge-JYQ4wEdysTsAUPnp57Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ge-JYA4wEdysTsAUPnp57Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ge-JYQ4wEdysTsAUPnp57Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GfH6YA4wEdysTsAUPnp57Q">
<value xsi:nil="true"/>
</defaultValue>
@@ -367,8 +367,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_P9c2AA4wEdysTsAUPnp57Q" name="NfpConstraint">
<ownedAttribute xmi:id="_Ru_sIA4wEdysTsAUPnp57Q" name="kind" visibility="public" type="_ZCtm0A4vEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_USm4YA4wEdysTsAUPnp57Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_USducA4wEdysTsAUPnp57Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_USm4YA4wEdysTsAUPnp57Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TgPnUQ4wEdysTsAUPnp57Q">
<value xsi:nil="true"/>
</defaultValue>
@@ -377,8 +377,8 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Constraint"/>
</ownedAttribute>
<ownedAttribute xmi:id="_ynxogECREd6UTJZnztgOLw" name="mode" type="_yeqiEECMEd6UTJZnztgOLw" isUnique="false" association="_ymHboECREd6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yo_JcECREd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yo6Q8ECREd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yo_JcECREd6UTJZnztgOLw" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_aZKm8A4wEdysTsAUPnp57Q" name="Extension_NfpConstraint" memberEnd="_aZUX8A4wEdysTsAUPnp57Q _aZUX8Q4wEdysTsAUPnp57Q">
@@ -388,24 +388,24 @@
<generalization xmi:id="_AqDVcBFGEdyBd9q9NMDXUQ" general="_IkLw0A-NEdyLh7muGbCqMw"/>
<ownedAttribute xmi:id="_DA2NsBFGEdyBd9q9NMDXUQ" name="valueAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HCVtMRFGEdyBd9q9NMDXUQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HCVtMBFGEdyBd9q9NMDXUQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HCVtMRFGEdyBd9q9NMDXUQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HCfeMBFGEdyBd9q9NMDXUQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_J2pA0BFGEdyBd9q9NMDXUQ" name="unitAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L7HaABFGEdyBd9q9NMDXUQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L69pABFGEdyBd9q9NMDXUQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L7HaABFGEdyBd9q9NMDXUQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_L7RLABFGEdyBd9q9NMDXUQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_MyZnUBFGEdyBd9q9NMDXUQ" name="exprAttrib" visibility="public" isUnique="false" subsettedProperty="_Xy1aYA-PEdyLh7muGbCqMw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PTx-8BFGEdyBd9q9NMDXUQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PToN8BFGEdyBd9q9NMDXUQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PTx-8BFGEdyBd9q9NMDXUQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_PTx-8RFGEdyBd9q9NMDXUQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -414,23 +414,23 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_gX6fcECJEd6UTJZnztgOLw" name="Dimension">
<ownedAttribute xmi:id="_o2jfsECJEd6UTJZnztgOLw" name="symbol" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VVIckECLEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VU8PUECLEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VVIckECLEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_VVcloECLEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_o683gECJEd6UTJZnztgOLw" name="baseDimension" visibility="public" type="_gX6fcECJEd6UTJZnztgOLw" isOrdered="true" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z6DZQECLEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z57dcECLEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z6DZQECLEd6UTJZnztgOLw" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Z6HqsECLEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_o_eLIECJEd6UTJZnztgOLw" name="baseExponent" visibility="public" isOrdered="true" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_extEsECLEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_exozQECLEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_extEsECLEd6UTJZnztgOLw" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ex3cwECLEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -444,8 +444,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_ymHboECREd6UTJZnztgOLw" name="A_NfpConstraint_Mode" memberEnd="_ynxogECREd6UTJZnztgOLw _ypCMwECREd6UTJZnztgOLw">
<ownedEnd xmi:id="_ypCMwECREd6UTJZnztgOLw" name="nfpConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_ymHboECREd6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypm0gECREd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yprF8ECREd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypm0gECREd6UTJZnztgOLw" value="*"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -462,22 +462,22 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7jVgbG3Ed-tmN4hwNCxXQ" name="TimedDomain">
<eAnnotations xmi:id="_b7jVgrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hEbW8BBSEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVg7G3Ed-tmN4hwNCxXQ" name="base_Namespace" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Namespace"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7jVhbG3Ed-tmN4hwNCxXQ" name="Clock">
<eAnnotations xmi:id="_b7jVhrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_i_gjkBBSEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7jVh7G3Ed-tmN4hwNCxXQ" name="standard" ordered="false" unique="false" eType="_b7jVk7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVibG3Ed-tmN4hwNCxXQ" name="base_InstanceSpecification" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InstanceSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InstanceSpecification"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVi7G3Ed-tmN4hwNCxXQ" name="type" ordered="false" unique="false" lowerBound="1" eType="_b7jVoLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVjbG3Ed-tmN4hwNCxXQ" name="unit" ordered="false" unique="false" eType="_b7Zki7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVj7G3Ed-tmN4hwNCxXQ" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVkbG3Ed-tmN4hwNCxXQ" name="base_Event" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Event"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Event"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b7jVk7G3Ed-tmN4hwNCxXQ" name="MARTE_Library_TimeTypesLibrary_TimeStandardKind">
@@ -500,29 +500,29 @@
<eAnnotations xmi:id="_b7jVobG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4bvoBBSEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7jVorG3Ed-tmN4hwNCxXQ" name="nature" ordered="false" unique="false" lowerBound="1" eType="_b7jVtrG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVpLG3Ed-tmN4hwNCxXQ" name="unitType" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Enumeration"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7jVprG3Ed-tmN4hwNCxXQ" name="isLogical" ordered="false" unique="false" lowerBound="1" eType="_cGIN0LG3Ed-tmN4hwNCxXQ" defaultValueLiteral="false"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVqLG3Ed-tmN4hwNCxXQ" name="resolAttr" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVqrG3Ed-tmN4hwNCxXQ" name="maxValAttr" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVrLG3Ed-tmN4hwNCxXQ" name="offsetAttr" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVrrG3Ed-tmN4hwNCxXQ" name="getTime" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVsLG3Ed-tmN4hwNCxXQ" name="setTime" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVsrG3Ed-tmN4hwNCxXQ" name="indexToValue" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jVtLG3Ed-tmN4hwNCxXQ" name="base_Class" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b7jVtrG3Ed-tmN4hwNCxXQ" name="MARTE_Library_TimeTypesLibrary_TimeNatureKind">
@@ -550,7 +550,7 @@
<eAnnotations xmi:id="_b7jVzbG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_JUPuYBCWEdyu4qthTScrTA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7jVzrG3Ed-tmN4hwNCxXQ" name="interpretation" ordered="false" unique="false" eType="_b7jV07G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jV0LG3Ed-tmN4hwNCxXQ" name="base_ValueSpecification" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b7jV07G3Ed-tmN4hwNCxXQ" name="MARTE_Library_TimeTypesLibrary_TimeInterpretationKind">
@@ -582,7 +582,7 @@
<eAnnotations xmi:id="_b7jV-bG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_noixsBD2EdyybZnLxHsjyA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7jV-rG3Ed-tmN4hwNCxXQ" name="obsKind" ordered="false" unique="false" eType="_b7jV_7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jV_LG3Ed-tmN4hwNCxXQ" name="base_TimeObservation" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeObservation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeObservation"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b7jV_7G3Ed-tmN4hwNCxXQ" name="MARTE_Library_TimeTypesLibrary_EventKind">
@@ -599,17 +599,17 @@
<eAnnotations xmi:id="_b7jWB7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xRmWoBD2EdyybZnLxHsjyA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7jWCLG3Ed-tmN4hwNCxXQ" name="obsKind" ordered="false" unique="false" upperBound="2" eType="_b7jV_7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWCrG3Ed-tmN4hwNCxXQ" name="base_DurationObservation" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DurationObservation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DurationObservation"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7jWDbG3Ed-tmN4hwNCxXQ" name="TimedEvent" eSuperTypes="_b7jVyLG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b7jWDrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_gp3dcBD4EdyybZnLxHsjyA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7jWD7G3Ed-tmN4hwNCxXQ" name="repetition" ordered="false" unique="false" eType="_cJGpULG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWEbG3Ed-tmN4hwNCxXQ" name="base_TimeEvent" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeEvent"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeEvent"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWE7G3Ed-tmN4hwNCxXQ" name="every" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b7jWFrG3Ed-tmN4hwNCxXQ" name="MARTE_Library_MARTE_PrimitivesTypes_Integer" instanceClassName="int">
@@ -620,22 +620,22 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7jWGLG3Ed-tmN4hwNCxXQ" name="TimedProcessing" eSuperTypes="_b7jVyLG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b7jWGbG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_3V3e0BD5EdyybZnLxHsjyA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWGrG3Ed-tmN4hwNCxXQ" name="base_Action" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Action"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Action"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWHLG3Ed-tmN4hwNCxXQ" name="base_Behavior" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWHrG3Ed-tmN4hwNCxXQ" name="base_Message" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Message"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWILG3Ed-tmN4hwNCxXQ" name="duration" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWIrG3Ed-tmN4hwNCxXQ" name="start" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Event"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Event"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7jWJLG3Ed-tmN4hwNCxXQ" name="finish" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Event"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Event"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_cGIN0LG3Ed-tmN4hwNCxXQ" name="Boolean" instanceClassName="java.lang.String">
@@ -660,19 +660,19 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0zmo4Zi4Ed-m0Oaexd_lJA" name="TimedDomain">
<eAnnotations xmi:id="_0zmo4pi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hEbW8BBSEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmo45i4Ed-m0Oaexd_lJA" name="base_Namespace" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Namespace"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0zmo5Zi4Ed-m0Oaexd_lJA" name="Clock">
<eAnnotations xmi:id="_0zmo5pi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_i_gjkBBSEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0zmo55i4Ed-m0Oaexd_lJA" name="standard" ordered="false" unique="false" eType="_0zmo8Zi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmo6Zi4Ed-m0Oaexd_lJA" name="base_InstanceSpecification" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InstanceSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InstanceSpecification"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmo65i4Ed-m0Oaexd_lJA" name="type" ordered="false" unique="false" lowerBound="1" eType="_0zmo_pi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmo7Zi4Ed-m0Oaexd_lJA" name="unit" ordered="false" unique="false" eType="_0smpCpi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmo75i4Ed-m0Oaexd_lJA" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_0zmo8Zi4Ed-m0Oaexd_lJA" name="MARTE_Library_TimeTypesLibrary_TimeStandardKind">
@@ -695,29 +695,29 @@
<eAnnotations xmi:id="_0zmo_5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_j4bvoBBSEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0zmpAJi4Ed-m0Oaexd_lJA" name="nature" ordered="false" unique="false" lowerBound="1" eType="_0zmpFJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpApi4Ed-m0Oaexd_lJA" name="unitType" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Enumeration"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0zmpBJi4Ed-m0Oaexd_lJA" name="isLogical" ordered="false" unique="false" lowerBound="1" eType="_4ds8EJi4Ed-m0Oaexd_lJA" defaultValueLiteral="false"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpBpi4Ed-m0Oaexd_lJA" name="resolAttr" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpCJi4Ed-m0Oaexd_lJA" name="maxValAttr" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpCpi4Ed-m0Oaexd_lJA" name="offsetAttr" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpDJi4Ed-m0Oaexd_lJA" name="getTime" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpDpi4Ed-m0Oaexd_lJA" name="setTime" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpEJi4Ed-m0Oaexd_lJA" name="indexToValue" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpEpi4Ed-m0Oaexd_lJA" name="base_Class" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_0zmpFJi4Ed-m0Oaexd_lJA" name="MARTE_Library_TimeTypesLibrary_TimeNatureKind">
@@ -745,7 +745,7 @@
<eAnnotations xmi:id="_0zmpK5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_JUPuYBCWEdyu4qthTScrTA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0zmpLJi4Ed-m0Oaexd_lJA" name="interpretation" ordered="false" unique="false" eType="_0zmpMZi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpLpi4Ed-m0Oaexd_lJA" name="base_ValueSpecification" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_0zmpMZi4Ed-m0Oaexd_lJA" name="MARTE_Library_TimeTypesLibrary_TimeInterpretationKind">
@@ -780,7 +780,7 @@
<eAnnotations xmi:id="_0zmpWpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_noixsBD2EdyybZnLxHsjyA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0zmpW5i4Ed-m0Oaexd_lJA" name="obsKind" ordered="false" unique="false" eType="_0zmpYJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpXZi4Ed-m0Oaexd_lJA" name="base_TimeObservation" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeObservation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeObservation"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_0zmpYJi4Ed-m0Oaexd_lJA" name="MARTE_Library_TimeTypesLibrary_EventKind">
@@ -797,17 +797,17 @@
<eAnnotations xmi:id="_0zmpaJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xRmWoBD2EdyybZnLxHsjyA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0zmpaZi4Ed-m0Oaexd_lJA" name="obsKind" ordered="false" unique="false" upperBound="2" eType="_0zmpYJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpa5i4Ed-m0Oaexd_lJA" name="base_DurationObservation" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DurationObservation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DurationObservation"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0zmpbpi4Ed-m0Oaexd_lJA" name="TimedEvent" eSuperTypes="_0zmpJpi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_0zmpb5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_gp3dcBD4EdyybZnLxHsjyA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0zmpcJi4Ed-m0Oaexd_lJA" name="repetition" ordered="false" unique="false" eType="_4hblgJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpcpi4Ed-m0Oaexd_lJA" name="base_TimeEvent" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeEvent"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeEvent"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpdJi4Ed-m0Oaexd_lJA" name="every" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_0zmpd5i4Ed-m0Oaexd_lJA" name="MARTE_Library_MARTE_PrimitivesTypes_Integer" instanceClassName="MARTE_Library_MARTE_PrimitivesTypes_Integer">
@@ -818,22 +818,22 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0zmpeZi4Ed-m0Oaexd_lJA" name="TimedProcessing" eSuperTypes="_0zmpJpi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_0zmpepi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_3V3e0BD5EdyybZnLxHsjyA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpe5i4Ed-m0Oaexd_lJA" name="base_Action" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Action"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Action"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpfZi4Ed-m0Oaexd_lJA" name="base_Behavior" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpf5i4Ed-m0Oaexd_lJA" name="base_Message" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Message"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpgZi4Ed-m0Oaexd_lJA" name="duration" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmpg5i4Ed-m0Oaexd_lJA" name="start" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Event"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Event"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0zmphZi4Ed-m0Oaexd_lJA" name="finish" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Event"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Event"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_4ds8EJi4Ed-m0Oaexd_lJA" name="Boolean" instanceClassName="java.lang.String">
@@ -861,8 +861,8 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_i_gjkBBSEdyt6tGzWCpUVA" name="Clock">
<ownedAttribute xmi:id="_odZIkBBSEdyt6tGzWCpUVA" name="standard" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_MDyyoA-KEdyNj8xzjk-DoA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sjW4YBBSEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sjNHYBBSEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sjW4YBBSEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sjW4YRBSEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
@@ -871,12 +871,12 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>
</ownedAttribute>
<ownedAttribute xmi:id="_skGj0BCVEdyu4qthTScrTA" name="type" type="_j4bvoBBSEdyt6tGzWCpUVA" isUnique="false" association="_sj8y0BCVEdyu4qthTScrTA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ssfpQGqGEdyHVMM3AaZxvA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ssbX0GqGEdyHVMM3AaZxvA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ssfpQGqGEdyHVMM3AaZxvA" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_7R2xsRCVEdyu4qthTScrTA" name="unit" type="_xNTikA4vEdysTsAUPnp57Q" isUnique="false" association="_7R2xsBCVEdyu4qthTScrTA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A7D14BCWEdyu4qthTScrTA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A66E4BCWEdyu4qthTScrTA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A7D14BCWEdyu4qthTScrTA" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_dkEmIDJLEd211cMdxu944g" name="base_Property" isUnique="false" association="_dZML0DJLEd211cMdxu944g">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
@@ -888,70 +888,70 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_j4bvoBBSEdyt6tGzWCpUVA" name="ClockType">
<ownedAttribute xmi:id="_wZrCoBBSEdyt6tGzWCpUVA" name="nature" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_WAvb0A75EdyML4mHwjNDrw"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1KP1sBBSEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1KGrwBBSEdyt6tGzWCpUVA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1KP1sBBSEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_1KP1sRBSEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_we450BBSEdyt6tGzWCpUVA" name="unitType" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Enumeration"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__RaS8BBSEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__RQh8BBSEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__RaS8BBSEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__RaS8RBSEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_wn-kYBBSEdyt6tGzWCpUVA" name="isLogical" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mcz9QBBTEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_McqMQBBTEdyt6tGzWCpUVA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mcz9QBBTEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_JhtzMBBVEdyt6tGzWCpUVA"/>
</ownedAttribute>
<ownedAttribute xmi:id="_wt8CcBBSEdyt6tGzWCpUVA" name="resolAttr" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MYZscRBVEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MYZscBBVEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MYZscRBVEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_MYjdcBBVEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_wzJ5oBBSEdyt6tGzWCpUVA" name="maxValAttr" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PurrwBBVEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Puh6wBBVEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PurrwBBVEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_PurrwRBVEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_w4XJwBBSEdyt6tGzWCpUVA" name="offsetAttr" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S5Vp4RBVEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S5Vp4BBVEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S5Vp4RBVEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_S5fa4BBVEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_w9SGABBSEdyt6tGzWCpUVA" name="getTime" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U1d_YRBVEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U1d_YBBVEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U1d_YRBVEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_U1d_YhBVEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_xESF4BBSEdyt6tGzWCpUVA" name="setTime" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZolJERBVEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZolJEBBVEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZolJERBVEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ZouTABBVEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_xJpuEBBSEdyt6tGzWCpUVA" name="indexToValue" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cAuFIBBVEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cAkUIBBVEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cAuFIBBVEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cAuFIRBVEdyt6tGzWCpUVA">
<value xsi:nil="true"/>
</defaultValue>
@@ -962,8 +962,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_llNagBBSEdyt6tGzWCpUVA" name="TimedElement" isAbstract="true">
<ownedAttribute xmi:id="_Fp8a8BBWEdyt6tGzWCpUVA" name="on" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_FpfvABBWEdyt6tGzWCpUVA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JBaGARBWEdyt6tGzWCpUVA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JBaGABBWEdyt6tGzWCpUVA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JBaGARBWEdyt6tGzWCpUVA" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_-lF4IBBVEdyt6tGzWCpUVA" name="Extension_ClockType" memberEnd="_-lPpIBBVEdyt6tGzWCpUVA _-lZaIBBVEdyt6tGzWCpUVA">
@@ -974,28 +974,28 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_FpfvABBWEdyt6tGzWCpUVA" name="Association_TimedElement_Clock" memberEnd="_Fp8a8BBWEdyt6tGzWCpUVA _FqFk4BBWEdyt6tGzWCpUVA">
<ownedEnd xmi:id="_FqFk4BBWEdyt6tGzWCpUVA" name="timedElement" type="_llNagBBSEdyt6tGzWCpUVA" isUnique="false" association="_FpfvABBWEdyt6tGzWCpUVA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FqPV4BBWEdyt6tGzWCpUVA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FqPV4RBWEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FqPV4BBWEdyt6tGzWCpUVA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_sj8y0BCVEdyu4qthTScrTA" name="Association_Clock_ClockType" memberEnd="_skGj0BCVEdyu4qthTScrTA _skQU0hCVEdyu4qthTScrTA">
<ownedEnd xmi:id="_skQU0hCVEdyu4qthTScrTA" name="clock" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_sj8y0BCVEdyu4qthTScrTA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_skjPwBCVEdyu4qthTScrTA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_skjPwRCVEdyu4qthTScrTA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_skjPwBCVEdyu4qthTScrTA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_7R2xsBCVEdyu4qthTScrTA" name="Association_Clock_Unit" memberEnd="_7R2xsRCVEdyu4qthTScrTA _7SAishCVEdyu4qthTScrTA">
<ownedEnd xmi:id="_7SAishCVEdyu4qthTScrTA" name="clock" type="_i_gjkBBSEdyt6tGzWCpUVA" isUnique="false" association="_7R2xsBCVEdyu4qthTScrTA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7SJsoBCVEdyu4qthTScrTA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7SJsoRCVEdyu4qthTScrTA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7SJsoBCVEdyu4qthTScrTA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_JUPuYBCWEdyu4qthTScrTA" name="TimedValueSpecification">
<generalization xmi:id="_WruF0BCWEdyu4qthTScrTA" general="_llNagBBSEdyt6tGzWCpUVA"/>
<ownedAttribute xmi:id="_LerloBCWEdyu4qthTScrTA" name="interpretation" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_a_LrwA75EdyML4mHwjNDrw"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SI2XkBCWEdyu4qthTScrTA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SItNoBCWEdyu4qthTScrTA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SI2XkBCWEdyu4qthTScrTA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_SI2XkRCWEdyu4qthTScrTA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1012,8 +1012,8 @@
<generalization xmi:id="_KnZ9wBD2EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
<ownedAttribute xmi:id="_1EwUoBD1EdyybZnLxHsjyA" name="interpretation" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_a_LrwA75EdyML4mHwjNDrw"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3R3scBD1EdyybZnLxHsjyA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3Rt7cBD1EdyybZnLxHsjyA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3R3scBD1EdyybZnLxHsjyA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_3R3scRD1EdyybZnLxHsjyA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1024,24 +1024,24 @@
<generalization xmi:id="_NyziwBD2EdyybZnLxHsjyA" general="_P9c2AA4wEdysTsAUPnp57Q"/>
<ownedAttribute xmi:id="_JaIsYECaEd6UTJZnztgOLw" name="isCoincidenceBased" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P2E1EECaEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P1-HYECaEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P2E1EECaEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_P2NX8ECaEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Jfr6wECaEd6UTJZnztgOLw" name="isPrecedenceBased" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YsFMcECaEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YrvOMECaEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YsFMcECaEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_YseOAECaEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_JnyG0ECaEd6UTJZnztgOLw" name="isChronometricBased" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bU6P4ECaEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bUwe4ECaEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bU6P4ECaEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bVA9kECaEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1051,8 +1051,8 @@
<generalization xmi:id="_w6LWcLG1Ed-tmN4hwNCxXQ" general="_llNagBBSEdyt6tGzWCpUVA"/>
<ownedAttribute xmi:id="_qlx-4BD2EdyybZnLxHsjyA" name="obsKind" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_eMs4wA-KEdyNj8xzjk-DoA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_unbPYRD2EdyybZnLxHsjyA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_unbPYBD2EdyybZnLxHsjyA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_unbPYRD2EdyybZnLxHsjyA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_unlAYBD2EdyybZnLxHsjyA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1065,8 +1065,8 @@
<generalization xmi:id="_yHVtILG1Ed-tmN4hwNCxXQ" general="_llNagBBSEdyt6tGzWCpUVA"/>
<ownedAttribute xmi:id="_2QLwgBD2EdyybZnLxHsjyA" name="obsKind" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_eMs4wA-KEdyNj8xzjk-DoA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4XyWMRD2EdyybZnLxHsjyA" value="2"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4XyWMBD2EdyybZnLxHsjyA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4XyWMRD2EdyybZnLxHsjyA" value="2"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_2QLwgxD2EdyybZnLxHsjyA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1085,8 +1085,8 @@
<generalization xmi:id="_y_yE0BD4EdyybZnLxHsjyA" general="_llNagBBSEdyt6tGzWCpUVA"/>
<ownedAttribute xmi:id="_jA93sBD4EdyybZnLxHsjyA" name="repetition" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mSeEsBD4EdyybZnLxHsjyA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mSU6wBD4EdyybZnLxHsjyA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mSeEsBD4EdyybZnLxHsjyA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_mSeEsRD4EdyybZnLxHsjyA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1096,8 +1096,8 @@
</ownedAttribute>
<ownedAttribute xmi:id="_zA-VgBKWEdyGYuetzx6T5A" name="every" isUnique="false" aggregation="composite" association="_zAhpkBKWEdyGYuetzx6T5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1c_E8BKWEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1c17ABKWEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1c_E8BKWEdyGYuetzx6T5A" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_74QhYBD4EdyybZnLxHsjyA" name="Extension_TimedEvent" memberEnd="_74aSYBD4EdyybZnLxHsjyA _74jcUBD4EdyybZnLxHsjyA">
@@ -1116,18 +1116,18 @@
</ownedAttribute>
<ownedAttribute xmi:id="_OAQb4BKWEdyGYuetzx6T5A" name="duration" isUnique="false" aggregation="composite" association="_N_zv8BKWEdyGYuetzx6T5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y81eMBKWEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y8sUQBKWEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y81eMBKWEdyGYuetzx6T5A" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_dJUFsBKWEdyGYuetzx6T5A" name="start" isUnique="false" association="_dJBKwBKWEdyGYuetzx6T5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Event"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k_qW4BKWEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k_gl4BKWEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k_qW4BKWEdyGYuetzx6T5A" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_n3A-gBKWEdyGYuetzx6T5A" name="finish" isUnique="false" association="_n2uDkBKWEdyGYuetzx6T5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Event"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p2WZABKWEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p2NPEBKWEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p2WZABKWEdyGYuetzx6T5A" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_71hPEBD7EdyybZnLxHsjyA" name="Extension_TimedProcessing" memberEnd="_71rAEBD7EdyybZnLxHsjyA _7197ABD7EdyybZnLxHsjyA">
@@ -1141,26 +1141,26 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_N_zv8BKWEdyGYuetzx6T5A" name="Association_TimedProcessing_ValueSpecification" memberEnd="_OAQb4BKWEdyGYuetzx6T5A _OBcHoRKWEdyGYuetzx6T5A">
<ownedEnd xmi:id="_OBcHoRKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_N_zv8BKWEdyGYuetzx6T5A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OCLugBKWEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OCVfgBKWEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OCLugBKWEdyGYuetzx6T5A" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_dJBKwBKWEdyGYuetzx6T5A" name="Association_TimedProcessing_Event" memberEnd="_dJUFsBKWEdyGYuetzx6T5A _dKpicBKWEdyGYuetzx6T5A">
<ownedEnd xmi:id="_dKpicBKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_dJBKwBKWEdyGYuetzx6T5A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dLPYUBKWEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dLZJUBKWEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dLPYUBKWEdyGYuetzx6T5A" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_n2uDkBKWEdyGYuetzx6T5A" name="Association_TimedProcessing_Event" memberEnd="_n3A-gBKWEdyGYuetzx6T5A _n4WbQBKWEdyGYuetzx6T5A">
<ownedEnd xmi:id="_n4WbQBKWEdyGYuetzx6T5A" name="timedProcessing" type="_3V3e0BD5EdyybZnLxHsjyA" isUnique="false" association="_n2uDkBKWEdyGYuetzx6T5A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n484MBKWEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n5GCIBKWEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n484MBKWEdyGYuetzx6T5A" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_zAhpkBKWEdyGYuetzx6T5A" name="Association_TimedEvent_ValueSpecification" memberEnd="_zA-VgBKWEdyGYuetzx6T5A _zCKoUBKWEdyGYuetzx6T5A">
<ownedEnd xmi:id="_zCKoUBKWEdyGYuetzx6T5A" name="timedEvent" type="_gp3dcBD4EdyybZnLxHsjyA" isUnique="false" association="_zAhpkBKWEdyGYuetzx6T5A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zC5oIBKWEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zC5oIRKWEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zC5oIBKWEdyGYuetzx6T5A" value="1"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_dZML0DJLEd211cMdxu944g" name="Extension_Clock" memberEnd="_djewQDJLEd211cMdxu944g _dkEmIDJLEd211cMdxu944g">
@@ -1189,19 +1189,19 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sfdbG3Ed-tmN4hwNCxXQ" name="isProtected" ordered="false" unique="false" eType="_iA7YULG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sfd7G3Ed-tmN4hwNCxXQ" name="isActive" ordered="false" unique="false" eType="_iA7YULG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sfebG3Ed-tmN4hwNCxXQ" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sfe7G3Ed-tmN4hwNCxXQ" name="base_InstanceSpecification" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InstanceSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InstanceSpecification"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sffbG3Ed-tmN4hwNCxXQ" name="base_Classifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Classifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sff7G3Ed-tmN4hwNCxXQ" name="base_Lifeline" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Lifeline"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Lifeline"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sfgbG3Ed-tmN4hwNCxXQ" name="base_ConnectableElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ConnectableElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ConnectableElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b7sfg7G3Ed-tmN4hwNCxXQ" name="MARTE_Library_BasicNFP_Types_NFP_Integer" instanceClassName="java.lang.String">
@@ -1313,7 +1313,7 @@
<eAnnotations xmi:id="_b7sf6bG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_XpH50BG1Edyb1KzJ7GkiGA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sf6rG3Ed-tmN4hwNCxXQ" name="elementSize" ordered="false" unique="false" eType="_g_ZC0LG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sf7LG3Ed-tmN4hwNCxXQ" name="base_Connector" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Connector"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Connector"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sf7rG3Ed-tmN4hwNCxXQ" name="transmMode" ordered="false" unique="false" eType="_b7sf97G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sf8LG3Ed-tmN4hwNCxXQ" name="blockT" ordered="false" upperBound="-1" eType="_g41H0LG3Ed-tmN4hwNCxXQ"/>
@@ -1356,19 +1356,19 @@
<eAnnotations xmi:id="_b7sgEbG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_dDjlYBG5Edyb1KzJ7GkiGA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgErG3Ed-tmN4hwNCxXQ" name="owner" ordered="false" unique="false" eType="_b7sfcbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgFLG3Ed-tmN4hwNCxXQ" name="base_ExecutionSpecification" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ExecutionSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ExecutionSpecification"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgFrG3Ed-tmN4hwNCxXQ" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgGLG3Ed-tmN4hwNCxXQ" name="base_Behavior" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgGrG3Ed-tmN4hwNCxXQ" name="base_Collaboration" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Collaboration"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Collaboration"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgHLG3Ed-tmN4hwNCxXQ" name="base_CollaborationUse" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//CollaborationUse"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//CollaborationUse"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7sgHrG3Ed-tmN4hwNCxXQ" name="Release" eSuperTypes="_b7sgELG3Ed-tmN4hwNCxXQ">
@@ -1386,7 +1386,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sgLrG3Ed-tmN4hwNCxXQ" name="powerPeak" upperBound="-1" eType="_hfamsLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sgMLG3Ed-tmN4hwNCxXQ" name="energy" upperBound="-1" eType="_hfkXsLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgMrG3Ed-tmN4hwNCxXQ" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgNLG3Ed-tmN4hwNCxXQ" name="subUsage" ordered="false" unique="false" upperBound="-1" eType="_b7sgJrG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgNrG3Ed-tmN4hwNCxXQ" name="usedResources" unique="false" upperBound="-1" eType="_b7sfcbG3Ed-tmN4hwNCxXQ"/>
@@ -1476,19 +1476,19 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0-x-Jpi4Ed-m0Oaexd_lJA" name="isProtected" ordered="false" unique="false" eType="_BaWuAJi5Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0-x-KJi4Ed-m0Oaexd_lJA" name="isActive" ordered="false" unique="false" eType="_BaWuAJi5Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x-Kpi4Ed-m0Oaexd_lJA" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x-LJi4Ed-m0Oaexd_lJA" name="base_InstanceSpecification" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InstanceSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InstanceSpecification"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x-Lpi4Ed-m0Oaexd_lJA" name="base_Classifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Classifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x-MJi4Ed-m0Oaexd_lJA" name="base_Lifeline" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Lifeline"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Lifeline"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x-Mpi4Ed-m0Oaexd_lJA" name="base_ConnectableElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ConnectableElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ConnectableElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4jqaJpi4Ed-m0Oaexd_lJA" name="resMult" ordered="false" unique="false" eType="_AzBBMJi5Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -1562,7 +1562,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0-x-vZi4Ed-m0Oaexd_lJA" name="schedPolicy" ordered="false" unique="false" eType="_0-x-zJi4Ed-m0Oaexd_lJA" defaultValueLiteral="FixedPriority"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0-x-v5i4Ed-m0Oaexd_lJA" name="otherSchedPolicy" ordered="false" unique="false" eType="_AMt2MJi5Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x-wZi4Ed-m0Oaexd_lJA" name="schedule" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//OpaqueExpression"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueExpression"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x-w5i4Ed-m0Oaexd_lJA" name="processingUnits" ordered="false" unique="false" upperBound="-1" eType="_0-x-2Ji4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x-xZi4Ed-m0Oaexd_lJA" name="host" ordered="false" unique="false" eType="_0-x-5Ji4Ed-m0Oaexd_lJA"/>
@@ -1648,7 +1648,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0-x_TZi4Ed-m0Oaexd_lJA" name="CommunicationMedia" eSuperTypes="_0-x-2Ji4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_0-x_Tpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_XpH50BG1Edyb1KzJ7GkiGA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_UZi4Ed-m0Oaexd_lJA" name="base_Connector" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Connector"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Connector"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_0-x_U5i4Ed-m0Oaexd_lJA" name="transmMode" ordered="false" unique="false" eType="_0-x_XJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_5BwrYJi4Ed-m0Oaexd_lJA" name="elementSize" ordered="false" unique="false" eType="__vNa0Ji4Ed-m0Oaexd_lJA"/>
@@ -1690,19 +1690,19 @@
<eAnnotations xmi:id="_0-x_fpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_dDjlYBG5Edyb1KzJ7GkiGA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_f5i4Ed-m0Oaexd_lJA" name="owner" ordered="false" unique="false" eType="_0-x-Ipi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_gZi4Ed-m0Oaexd_lJA" name="base_ExecutionSpecification" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ExecutionSpecification"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ExecutionSpecification"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_g5i4Ed-m0Oaexd_lJA" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_hZi4Ed-m0Oaexd_lJA" name="base_Behavior" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_h5i4Ed-m0Oaexd_lJA" name="base_Collaboration" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Collaboration"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Collaboration"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_iZi4Ed-m0Oaexd_lJA" name="base_CollaborationUse" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//CollaborationUse"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//CollaborationUse"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0-x_i5i4Ed-m0Oaexd_lJA" name="Release" eSuperTypes="_0-x_fZi4Ed-m0Oaexd_lJA">
@@ -1715,7 +1715,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_0-x_k5i4Ed-m0Oaexd_lJA" name="ResourceUsage">
<eAnnotations xmi:id="_0-x_lJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8JKLcBG5Edyb1KzJ7GkiGA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_n5i4Ed-m0Oaexd_lJA" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_oZi4Ed-m0Oaexd_lJA" name="subUsage" ordered="false" unique="false" upperBound="-1" eType="_0-x_k5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_0-x_o5i4Ed-m0Oaexd_lJA" name="usedResources" unique="false" upperBound="-1" eType="_0-x-Ipi4Ed-m0Oaexd_lJA"/>
@@ -1809,22 +1809,22 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_BthQEBGzEdyb1KzJ7GkiGA" name="Resource">
<ownedAttribute xmi:id="_CmJhMBGzEdyb1KzJ7GkiGA" name="resMult" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F7rSkBGzEdyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F7iIoBGzEdyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F7rSkBGzEdyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_F7rSkRGzEdyb1KzJ7GkiGA" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_G2PdYBGzEdyb1KzJ7GkiGA" name="isProtected" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I8W1URGzEdyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I8W1UBGzEdyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I8W1URGzEdyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_I8f_QBGzEdyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_HNL9wBGzEdyb1KzJ7GkiGA" name="isActive" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LifxIBGzEdyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LiWnMBGzEdyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LifxIBGzEdyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LipiIBGzEdyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1864,8 +1864,8 @@
<generalization xmi:id="_aRAM8BGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_UAAwABGzEdyb1KzJ7GkiGA" name="elementSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WlaE8RGzEdyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WlaE8BGzEdyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WlaE8RGzEdyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Wlj18BGzEdyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1875,8 +1875,8 @@
<generalization xmi:id="_k5-90BGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_ejU9wBGzEdyb1KzJ7GkiGA" name="packetSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gmwOERGzEdyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gmwOEBGzEdyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gmwOERGzEdyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gm5_EBGzEdyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1892,123 +1892,123 @@
<generalization xmi:id="_4tBqgBGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_X9p00BG0Edyb1KzJ7GkiGA" name="isPreemptible" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cVpv0BG0Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cVf-0BG0Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cVpv0BG0Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cVpv0RG0Edyb1KzJ7GkiGA" value="true"/>
</ownedAttribute>
<ownedAttribute xmi:id="_YBrZMBG0Edyb1KzJ7GkiGA" name="schedPolicy" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_4GfMYBFaEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ipnoQRG0Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ipnoQBG0Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ipnoQRG0Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ipxZQBG0Edyb1KzJ7GkiGA" value="FixedPriority"/>
</ownedAttribute>
<ownedAttribute xmi:id="_YE9WsBG0Edyb1KzJ7GkiGA" name="otherSchedPolicy" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lSwNsBG0Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lSmcsBG0Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lSwNsBG0Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_lS5XoBG0Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_YIFjMBG0Edyb1KzJ7GkiGA" name="schedule" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_HRbMoLGzEd-tmN4hwNCxXQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nsiIgRG0Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nsiIgBG0Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nsiIgRG0Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nsrScBG0Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_6-SlsBG3Edyb1KzJ7GkiGA" name="processingUnits" type="_O_i04BG1Edyb1KzJ7GkiGA" isUnique="false" association="_6-I0sBG3Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6-lgoRG3Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6-lgoBG3Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6-lgoRG3Edyb1KzJ7GkiGA" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_G3vf8BG4Edyb1KzJ7GkiGA" name="host" type="_e_tF0BG1Edyb1KzJ7GkiGA" isUnique="false" association="_G3lu8BG4Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J9B14RG4Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J9B14BG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J9B14RG4Edyb1KzJ7GkiGA" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_NN8NABG4Edyb1KzJ7GkiGA" name="protectedSharedResources" type="_y3mvQBGzEdyb1KzJ7GkiGA" association="_NNgIIBG4Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NOPvABG4Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NOY48BG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NOPvABG4Edyb1KzJ7GkiGA" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_h01_khG4Edyb1KzJ7GkiGA" name="schedulableResources" type="_1zYucBG0Edyb1KzJ7GkiGA" association="_h0jEoBG4Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h1SrgBG4Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h1SrgRG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h1SrgBG4Edyb1KzJ7GkiGA" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_y3mvQBGzEdyb1KzJ7GkiGA" name="MutualExclusionResource">
<generalization xmi:id="_2y-_sBGzEdyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_8HCTQBGzEdyb1KzJ7GkiGA" name="protectKind" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_HkE7wBFbEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VTLVQGqNEdyHVMM3AaZxvA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VTHq4GqNEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VTLVQGqNEdyHVMM3AaZxvA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ARdsUBG0Edyb1KzJ7GkiGA" value="PriorityInheritance"/>
</ownedAttribute>
<ownedAttribute xmi:id="_8tB8QBGzEdyb1KzJ7GkiGA" name="ceiling" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HGEMoBG0Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HF7CsBG0Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HGEMoBG0Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HGEMoRG0Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8xgMkBGzEdyb1KzJ7GkiGA" name="otherProtectProtocol" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_K7fmERG0Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_K7fmEBG0Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_K7fmERG0Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_K7owABG0Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_NNpSEBG4Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_NNgIIBG4Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PTdIABG4Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PTT-EBG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PTdIABG4Edyb1KzJ7GkiGA" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_vVI4oBG0Edyb1KzJ7GkiGA" name="SecondaryScheduler">
<generalization xmi:id="_0jhCABG0Edyb1KzJ7GkiGA" general="_rU9dMBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_kCaDUhG4Edyb1KzJ7GkiGA" name="virtualProcessingUnits" type="_1zYucBG0Edyb1KzJ7GkiGA" association="_kB9XYBG4Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kC2vQBG4Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kC2vQRG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kC2vQBG4Edyb1KzJ7GkiGA" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_1zYucBG0Edyb1KzJ7GkiGA" name="SchedulableResource">
<generalization xmi:id="_IGLJUBG1Edyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_5BUqEBG0Edyb1KzJ7GkiGA" name="schedParams" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_d6I-0BFbEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__ZBL8RG0Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__ZBL8BG0Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__ZBL8RG0Edyb1KzJ7GkiGA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__ZK88BG0Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_h0jEoRG4Edyb1KzJ7GkiGA" name="host" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_h0jEoBG4Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_scVisRG4Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_scVisBG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_scVisRG4Edyb1KzJ7GkiGA" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_kCHIYBG4Edyb1KzJ7GkiGA" name="dependentScheduler" type="_vVI4oBG0Edyb1KzJ7GkiGA" isUnique="false" association="_kB9XYBG4Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-EqEQRG4Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-EqEQBG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-EqEQRG4Edyb1KzJ7GkiGA" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_O_i04BG1Edyb1KzJ7GkiGA" name="ProcessingResource">
<generalization xmi:id="_VH5TMBG1Edyb1KzJ7GkiGA" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_RHTLkBG1Edyb1KzJ7GkiGA" name="speedFactor" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AUQO0GqOEdyHVMM3AaZxvA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AUNLgGqOEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AUQO0GqOEdyHVMM3AaZxvA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_SwDSEBG1Edyb1KzJ7GkiGA" value="1.0"/>
</ownedAttribute>
<ownedAttribute xmi:id="_6RlQsBG3Edyb1KzJ7GkiGA" name="mainScheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_6RSVwBG3Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EIpccBG4Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EIWhgBG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EIpccBG4Edyb1KzJ7GkiGA" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_XpH50BG1Edyb1KzJ7GkiGA" name="CommunicationMedia">
<generalization xmi:id="_eEsPEBG1Edyb1KzJ7GkiGA" general="_O_i04BG1Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_ZUkH8BG1Edyb1KzJ7GkiGA" name="elementSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bMEcIRG1Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bMEcIBG1Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bMEcIRG1Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bMONIBG1Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
@@ -2018,32 +2018,32 @@
</ownedAttribute>
<ownedAttribute xmi:id="_uCvcwBKdEdymP89M8JXkzA" name="transmMode" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_wBn7gBEBEdyx6M3BlUjlCQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8U3ekBKdEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8UuUoBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8U3ekBKdEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8VBPkBKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_t9PRsBKdEdymP89M8JXkzA" name="blockT" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6kftIBKdEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6kWjMBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6kftIBKdEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6kpeIBKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_t4oegBKdEdymP89M8JXkzA" name="packetT" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vhIgBKdEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4vX-kBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vhIgBKdEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_4vhIgRKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_tamesBKdEdymP89M8JXkzA" name="capacity" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#__NI1EBFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2uWiABKdEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2uMxABKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2uWiABKdEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_2ugTABKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
@@ -2068,16 +2068,16 @@
<generalization xmi:id="_G5Mt8BG3Edyb1KzJ7GkiGA" general="_v37KsBG2Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_9OzFMBG2Edyb1KzJ7GkiGA" name="duration" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__pLc8BG2Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__pBr8BG2Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__pLc8BG2Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__pUm4BG2Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_9UnZUBG2Edyb1KzJ7GkiGA" name="isPeriodic" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C9qsgBG3Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C9g7gBG3Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C9qsgBG3Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_C90dgBG3Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
@@ -2085,20 +2085,20 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_6RSVwBG3Edyb1KzJ7GkiGA" name="Association_ProcessingResource_Scheduler" memberEnd="_6RlQsBG3Edyb1KzJ7GkiGA _6R4yshG3Edyb1KzJ7GkiGA">
<ownedEnd xmi:id="_6R4yshG3Edyb1KzJ7GkiGA" name="processingResource" type="_O_i04BG1Edyb1KzJ7GkiGA" isUnique="false" association="_6RSVwBG3Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6SVeoBG3Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6SVeoRG3Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6SVeoBG3Edyb1KzJ7GkiGA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_6-I0sBG3Edyb1KzJ7GkiGA" name="Association_Scheduler_ProcessingResource" memberEnd="_6-SlsBG3Edyb1KzJ7GkiGA _6-lgohG3Edyb1KzJ7GkiGA">
<ownedEnd xmi:id="_6-lgohG3Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_6-I0sBG3Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6_CMkBG3Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6_CMkRG3Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6_CMkBG3Edyb1KzJ7GkiGA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_G3lu8BG4Edyb1KzJ7GkiGA" name="Association_Scheduler_ComputingResource" memberEnd="_G3vf8BG4Edyb1KzJ7GkiGA _G4Ca4hG4Edyb1KzJ7GkiGA">
<ownedEnd xmi:id="_G4Ca4hG4Edyb1KzJ7GkiGA" name="scheduler" type="_rU9dMBGzEdyb1KzJ7GkiGA" isUnique="false" association="_G3lu8BG4Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4fG0BG4Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G4fG0RG4Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4fG0BG4Edyb1KzJ7GkiGA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_NNgIIBG4Edyb1KzJ7GkiGA" name="Association_MutualExclusionResource_Scheduler" memberEnd="_NNpSEBG4Edyb1KzJ7GkiGA _NN8NABG4Edyb1KzJ7GkiGA"/>
@@ -2106,8 +2106,8 @@
<packagedElement xmi:type="uml:Association" xmi:id="_kB9XYBG4Edyb1KzJ7GkiGA" name="Association_SchedulableResource_SecondaryScheduler" memberEnd="_kCHIYBG4Edyb1KzJ7GkiGA _kCaDUhG4Edyb1KzJ7GkiGA"/>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_dDjlYBG5Edyb1KzJ7GkiGA" name="GrService">
<ownedAttribute xmi:id="_ecz3UBG5Edyb1KzJ7GkiGA" name="owner" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gKe6EBG5Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gKVJEBG5Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gKe6EBG5Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gKorEBG5Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
@@ -2150,8 +2150,8 @@
<generalization xmi:id="_wgPnkBG5Edyb1KzJ7GkiGA" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_tJOBYBG5Edyb1KzJ7GkiGA" name="isBlocking" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u3VwEBG5Edyb1KzJ7GkiGA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u3MmIBG5Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u3VwEBG5Edyb1KzJ7GkiGA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_u3fhEBG5Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
@@ -2160,40 +2160,40 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_8JKLcBG5Edyb1KzJ7GkiGA" name="ResourceUsage">
<ownedAttribute xmi:id="_CqZD0BG6Edyb1KzJ7GkiGA" name="execTime" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fkEk4RG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fkEk4BG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fkEk4RG6Edyb1KzJ7GkiGA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HWfmkBG6Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_DDuJ0BG6Edyb1KzJ7GkiGA" name="allocatedMemory" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gs7qYRG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gs7qYBG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gs7qYRG6Edyb1KzJ7GkiGA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Qa5mURG6Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_DR36kBG6Edyb1KzJ7GkiGA" name="usedMemory" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hWXB4RG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hWXB4BG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hWXB4RG6Edyb1KzJ7GkiGA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Ugj0IBG6Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_DYI6oBG6Edyb1KzJ7GkiGA" name="powerPeak" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZsREABG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZsHTABG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZsREABG6Edyb1KzJ7GkiGA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ZsaN8BG6Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_DcwU4BG6Edyb1KzJ7GkiGA" name="energy" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_QmcNwBFTEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eLj50BG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eLaI0BG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eLj50BG6Edyb1KzJ7GkiGA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_eLj50RG6Edyb1KzJ7GkiGA">
<value xsi:nil="true"/>
</defaultValue>
@@ -2202,17 +2202,17 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
</ownedAttribute>
<ownedAttribute xmi:id="_uuI7URG6Edyb1KzJ7GkiGA" name="subUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_uuI7UBG6Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uulAMBG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uub2QBG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uulAMBG6Edyb1KzJ7GkiGA" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_nUkswBG6Edyb1KzJ7GkiGA" name="usedResources" type="_BthQEBGzEdyb1KzJ7GkiGA" isOrdered="true" isUnique="false" association="_nUbi0BG6Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nVLJsBG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nVBYsBG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nVLJsBG6Edyb1KzJ7GkiGA" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_hIfDQG0_Ed2Ua4_dHwAW8g" name="msgSize" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6PIXkG0_Ed2Ua4_dHwAW8g" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6O01kG0_Ed2Ua4_dHwAW8g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6PIXkG0_Ed2Ua4_dHwAW8g" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_j6ZxQW0_Ed2Ua4_dHwAW8g">
<value xsi:nil="true"/>
</defaultValue>
@@ -2223,14 +2223,14 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_nUbi0BG6Edyb1KzJ7GkiGA" name="Association_ResourceUsage_Resource" memberEnd="_nUkswBG6Edyb1KzJ7GkiGA _nVLJsRG6Edyb1KzJ7GkiGA">
<ownedEnd xmi:id="_nVLJsRG6Edyb1KzJ7GkiGA" name="resourceUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_nUbi0BG6Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nVn1oBG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nVn1oRG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nVn1oBG6Edyb1KzJ7GkiGA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_uuI7UBG6Edyb1KzJ7GkiGA" name="Association_ResourceUsage_ResourceUsage" memberEnd="_uuI7URG6Edyb1KzJ7GkiGA _uulAMRG6Edyb1KzJ7GkiGA">
<ownedEnd xmi:id="_uulAMRG6Edyb1KzJ7GkiGA" name="resourceUsage" type="_8JKLcBG5Edyb1KzJ7GkiGA" isUnique="false" association="_uuI7UBG6Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uvBsIBG6Edyb1KzJ7GkiGA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uvBsIRG6Edyb1KzJ7GkiGA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uvBsIBG6Edyb1KzJ7GkiGA" value="*"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -2247,7 +2247,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7sgQ7G3Ed-tmN4hwNCxXQ" name="Allocated">
<eAnnotations xmi:id="_b7sgRLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lpPl0BHaEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgRbG3Ed-tmN4hwNCxXQ" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgR7G3Ed-tmN4hwNCxXQ" name="allocatedTo" ordered="false" unique="false" upperBound="-1" eType="_b7sgQ7G3Ed-tmN4hwNCxXQ" volatile="true" transient="true" derived="true"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgSbG3Ed-tmN4hwNCxXQ" name="allocatedFrom" ordered="false" unique="false" upperBound="-1" eType="_b7sgQ7G3Ed-tmN4hwNCxXQ" volatile="true" transient="true" derived="true"/>
@@ -2276,7 +2276,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sgXrG3Ed-tmN4hwNCxXQ" name="kind" ordered="false" unique="false" eType="_b7sgV7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sgYLG3Ed-tmN4hwNCxXQ" name="nature" ordered="false" unique="false" eType="_b7sgU7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgYrG3Ed-tmN4hwNCxXQ" name="base_Abstraction" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Abstraction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Abstraction"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgZLG3Ed-tmN4hwNCxXQ" name="impliedConstraint" ordered="false" unique="false" upperBound="-1" eType="_b7Zkl7G3Ed-tmN4hwNCxXQ"/>
</eClassifiers>
@@ -2290,7 +2290,7 @@
<eAnnotations xmi:id="_b7sgeLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_FeRBMBHcEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sgebG3Ed-tmN4hwNCxXQ" name="isUnique" ordered="false" unique="false" eType="_ctTikLG3Ed-tmN4hwNCxXQ" defaultValueLiteral="false"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sge7G3Ed-tmN4hwNCxXQ" name="base_ActivityPartition" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ActivityPartition"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ActivityPartition"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b7sgfbG3Ed-tmN4hwNCxXQ" name="MARTE_Library_MARTE_PrimitivesTypes_Boolean" instanceClassName="boolean">
@@ -2301,7 +2301,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7sgf7G3Ed-tmN4hwNCxXQ" name="NfpRefine">
<eAnnotations xmi:id="_b7sggLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_NdrHwBHcEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sggbG3Ed-tmN4hwNCxXQ" name="base_Dependency" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Dependency"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Dependency"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgg7G3Ed-tmN4hwNCxXQ" name="constraint" ordered="false" unique="false" upperBound="-1" eType="_b7Zkl7G3Ed-tmN4hwNCxXQ"/>
</eClassifiers>
@@ -2311,13 +2311,13 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b7sgibG3Ed-tmN4hwNCxXQ" name="nature" ordered="false" unique="false" lowerBound="1" eType="_b7sgmLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgi7G3Ed-tmN4hwNCxXQ" name="impliedConstraint" ordered="false" unique="false" upperBound="-1" eType="_b7Zkl7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgjbG3Ed-tmN4hwNCxXQ" name="from" ordered="false" unique="false" lowerBound="1" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgj7G3Ed-tmN4hwNCxXQ" name="to" ordered="false" unique="false" lowerBound="1" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgkbG3Ed-tmN4hwNCxXQ" name="base_Comment" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Comment"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b7sgk7G3Ed-tmN4hwNCxXQ" name="AssignmentKind">
@@ -2348,22 +2348,22 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
</ownedAttribute>
<ownedAttribute xmi:id="_gTngIDJMEd211cMdxu944g" name="allocatedTo" visibility="public" type="_lpPl0BHaEdyWC5IKDhzksw" isUnique="false" isDerived="true">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_llYUsDJMEd211cMdxu944g" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_llOjsDJMEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_llYUsDJMEd211cMdxu944g" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_llheoDJMEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_gadvADJMEd211cMdxu944g" name="allocatedFrom" visibility="public" type="_lpPl0BHaEdyWC5IKDhzksw" isUnique="false" isDerived="true">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oZvSsDJMEd211cMdxu944g" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oZlhsDJMEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oZvSsDJMEd211cMdxu944g" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_oaCNoDJMEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_gfFwUDJMEd211cMdxu944g" name="kind" visibility="public" type="_XIxhMDJMEd211cMdxu944g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tccXkDJMEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tcTNoDJMEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tccXkDJMEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_tcmIkDJMEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
@@ -2383,15 +2383,15 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_kzoXABHbEdyWC5IKDhzksw" name="Allocate">
<ownedAttribute xmi:id="_ll2eIBHbEdyWC5IKDhzksw" name="kind" visibility="public" type="_VxKdYBHbEdyWC5IKDhzksw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nuygkBHbEdyWC5IKDhzksw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nuovkBHbEdyWC5IKDhzksw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nuygkBHbEdyWC5IKDhzksw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nu8RkBHbEdyWC5IKDhzksw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_lx6kMBHbEdyWC5IKDhzksw" name="nature" visibility="public" type="_VYSDUBHbEdyWC5IKDhzksw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qqPlEBHbEdyWC5IKDhzksw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qqGbIBHbEdyWC5IKDhzksw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qqPlEBHbEdyWC5IKDhzksw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_qqPlERHbEdyWC5IKDhzksw">
<value xsi:nil="true"/>
</defaultValue>
@@ -2400,8 +2400,8 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/>
</ownedAttribute>
<ownedAttribute xmi:id="_y9BTkBHbEdyWC5IKDhzksw" name="impliedConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_y84JoBHbEdyWC5IKDhzksw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y9d_gRHbEdyWC5IKDhzksw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y9d_gBHbEdyWC5IKDhzksw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y9d_gRHbEdyWC5IKDhzksw" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_tJsDABHbEdyWC5IKDhzksw" name="Extension_Allocate" memberEnd="_tJ10ABHbEdyWC5IKDhzksw _tKIu8BHbEdyWC5IKDhzksw">
@@ -2409,15 +2409,15 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_y84JoBHbEdyWC5IKDhzksw" name="Association_Allocate_NfpConstraint" memberEnd="_y9BTkBHbEdyWC5IKDhzksw _y9d_ghHbEdyWC5IKDhzksw">
<ownedEnd xmi:id="_y9d_ghHbEdyWC5IKDhzksw" name="allocate" type="_kzoXABHbEdyWC5IKDhzksw" isUnique="false" association="_y84JoBHbEdyWC5IKDhzksw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-EccBHbEdyWC5IKDhzksw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y-EccRHbEdyWC5IKDhzksw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y-EccBHbEdyWC5IKDhzksw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_FeRBMBHcEdyWC5IKDhzksw" name="AllocateActivityGroup">
<ownedAttribute xmi:id="_G6DpwBHcEdyWC5IKDhzksw" name="isUnique" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J2jQEBHcEdyWC5IKDhzksw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J2aGIBHcEdyWC5IKDhzksw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J2jQEBHcEdyWC5IKDhzksw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_J2jQERHcEdyWC5IKDhzksw" value="false"/>
</ownedAttribute>
<ownedAttribute xmi:id="_ManIQBHcEdyWC5IKDhzksw" name="base_ActivityPartition" isUnique="false" association="_MaUNUBHcEdyWC5IKDhzksw">
@@ -2432,8 +2432,8 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
</ownedAttribute>
<ownedAttribute xmi:id="_bzbsYBHcEdyWC5IKDhzksw" name="constraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_bzR7YBHcEdyWC5IKDhzksw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bz4YURHcEdyWC5IKDhzksw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bz4YUBHcEdyWC5IKDhzksw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bz4YURHcEdyWC5IKDhzksw" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_axtwsBHcEdyWC5IKDhzksw" name="Extension_ClockRefine" memberEnd="_ax3hsBHcEdyWC5IKDhzksw _ayKcoBHcEdyWC5IKDhzksw">
@@ -2441,8 +2441,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_bzR7YBHcEdyWC5IKDhzksw" name="A_NfpRefine_NfpConstraint" memberEnd="_bzbsYBHcEdyWC5IKDhzksw _b0CJUBHcEdyWC5IKDhzksw">
<ownedEnd xmi:id="_b0CJUBHcEdyWC5IKDhzksw" name="clockRefine" type="_NdrHwBHcEdyWC5IKDhzksw" isUnique="false" association="_bzR7YBHcEdyWC5IKDhzksw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_b0eOMBHcEdyWC5IKDhzksw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_b0n_MBHcEdyWC5IKDhzksw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_b0eOMBHcEdyWC5IKDhzksw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_XIxhMDJMEd211cMdxu944g" name="AllocationEndKind">
@@ -2453,32 +2453,32 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_455hUECmEd6UTJZnztgOLw" name="Assign">
<ownedAttribute xmi:id="_6JoD0ECmEd6UTJZnztgOLw" name="kind" visibility="public" type="_FeC-YECnEd6UTJZnztgOLw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_owDTcECnEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ov3GMECnEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_owDTcECnEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_owKBIECnEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_6N2cgECmEd6UTJZnztgOLw" name="nature" visibility="public" type="_9MtaUECmEd6UTJZnztgOLw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_skLsYECnEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_skDJgECnEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_skLsYECnEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_skVdYECnEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_txAr4ECnEd6UTJZnztgOLw" name="impliedConstraint" type="_P9c2AA4wEdysTsAUPnp57Q" isUnique="false" association="_tuSIAECnEd6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_txkFgECnEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_txhCMECnEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_txkFgECnEd6UTJZnztgOLw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_xKa3sECnEd6UTJZnztgOLw" name="from" isUnique="false" association="_xHQO8ECnEd6UTJZnztgOLw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zYRPUECnEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zYDz8ECnEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zYRPUECnEd6UTJZnztgOLw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_2NV_AECnEd6UTJZnztgOLw" name="to" isUnique="false" association="_2K-ngECnEd6UTJZnztgOLw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3hknAECnEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3hUvYECnEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3hknAECnEd6UTJZnztgOLw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_8-rv8ECnEd6UTJZnztgOLw" name="base_Comment" isUnique="false" association="_87_BQECnEd6UTJZnztgOLw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>
@@ -2495,20 +2495,20 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_tuSIAECnEd6UTJZnztgOLw" name="A_Assign_NfpConstraint" memberEnd="_txAr4ECnEd6UTJZnztgOLw _txnI0ECnEd6UTJZnztgOLw">
<ownedEnd xmi:id="_txnI0ECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_tuSIAECnEd6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tyJ7YECnEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tyPa8ECnEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tyJ7YECnEd6UTJZnztgOLw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_xHQO8ECnEd6UTJZnztgOLw" name="A_Assign_Element" memberEnd="_xKa3sECnEd6UTJZnztgOLw _xLB7sECnEd6UTJZnztgOLw">
<ownedEnd xmi:id="_xLB7sECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_xHQO8ECnEd6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xLmjcECnEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xLpmwECnEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xLmjcECnEd6UTJZnztgOLw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_2K-ngECnEd6UTJZnztgOLw" name="A_Assign_Element" memberEnd="_2NV_AECnEd6UTJZnztgOLw _2OLFcECnEd6UTJZnztgOLw">
<ownedEnd xmi:id="_2OLFcECnEd6UTJZnztgOLw" name="assign" type="_455hUECmEd6UTJZnztgOLw" isUnique="false" association="_2K-ngECnEd6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2OvtMECnEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2OywgECnEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2OvtMECnEd6UTJZnztgOLw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_87_BQECnEd6UTJZnztgOLw" name="Extension_Assign" memberEnd="_8-Xm4ECnEd6UTJZnztgOLw _8-rv8ECnEd6UTJZnztgOLw">
@@ -2528,28 +2528,28 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7sgnrG3Ed-tmN4hwNCxXQ" name="Mode">
<eAnnotations xmi:id="_b7sgn7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yeqiEECMEd6UTJZnztgOLw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgoLG3Ed-tmN4hwNCxXQ" name="base_State" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//State"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//State"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7sgorG3Ed-tmN4hwNCxXQ" name="ModeTransition">
<eAnnotations xmi:id="_b7sgo7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_2-EsoECMEd6UTJZnztgOLw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgpLG3Ed-tmN4hwNCxXQ" name="base_Transition" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Transition"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Transition"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7sgprG3Ed-tmN4hwNCxXQ" name="ModeBehavior">
<eAnnotations xmi:id="_b7sgp7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8DKXIECMEd6UTJZnztgOLw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgqLG3Ed-tmN4hwNCxXQ" name="base_StateMachine" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//StateMachine"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//StateMachine"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b7sgqrG3Ed-tmN4hwNCxXQ" name="Configuration">
<eAnnotations xmi:id="_b7sgq7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H0HcsECNEd6UTJZnztgOLw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgrLG3Ed-tmN4hwNCxXQ" name="base_StructuredClassifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//StructuredClassifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgrrG3Ed-tmN4hwNCxXQ" name="base_Package" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Package"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b7sgsLG3Ed-tmN4hwNCxXQ" name="mode" ordered="false" unique="false" upperBound="-1" eType="_b7sgnrG3Ed-tmN4hwNCxXQ"/>
</eClassifiers>
@@ -2565,28 +2565,28 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_1A3pLpi4Ed-m0Oaexd_lJA" name="Mode">
<eAnnotations xmi:id="_1A3pL5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yeqiEECMEd6UTJZnztgOLw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1A3pMJi4Ed-m0Oaexd_lJA" name="base_State" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//State"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//State"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_1A3pMpi4Ed-m0Oaexd_lJA" name="ModeTransition">
<eAnnotations xmi:id="_1A3pM5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_2-EsoECMEd6UTJZnztgOLw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1A3pNJi4Ed-m0Oaexd_lJA" name="base_Transition" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Transition"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Transition"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_1A3pNpi4Ed-m0Oaexd_lJA" name="ModeBehavior">
<eAnnotations xmi:id="_1A3pN5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_8DKXIECMEd6UTJZnztgOLw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1A3pOJi4Ed-m0Oaexd_lJA" name="base_StateMachine" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//StateMachine"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//StateMachine"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_1A3pOpi4Ed-m0Oaexd_lJA" name="Configuration">
<eAnnotations xmi:id="_1A3pO5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_H0HcsECNEd6UTJZnztgOLw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1A3pPJi4Ed-m0Oaexd_lJA" name="base_StructuredClassifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//StructuredClassifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1A3pPpi4Ed-m0Oaexd_lJA" name="base_Package" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Package"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1A3pQJi4Ed-m0Oaexd_lJA" name="mode" ordered="false" unique="false" upperBound="-1" eType="_1A3pLpi4Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -2636,8 +2636,8 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
</ownedAttribute>
<ownedAttribute xmi:id="_SEp4YECNEd6UTJZnztgOLw" name="mode" type="_yeqiEECMEd6UTJZnztgOLw" isUnique="false" association="_R3Jn4ECNEd6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SFMD4ECNEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SFJAkECNEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SFMD4ECNEd6UTJZnztgOLw" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_M-2cMECNEd6UTJZnztgOLw" name="Extension_Configuration" memberEnd="_NMnycECNEd6UTJZnztgOLw _NM9wsECNEd6UTJZnztgOLw">
@@ -2648,13 +2648,13 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_R3Jn4ECNEd6UTJZnztgOLw" name="A_Configuration_Mode" memberEnd="_SEp4YECNEd6UTJZnztgOLw _SFOgIECNEd6UTJZnztgOLw">
<ownedEnd xmi:id="_SFOgIECNEd6UTJZnztgOLw" name="configuration" type="_H0HcsECNEd6UTJZnztgOLw" isUnique="false" association="_R3Jn4ECNEd6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SFzH4ECNEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SF2LMECNEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SFzH4ECNEd6UTJZnztgOLw" value="*"/>
</ownedEnd>
</packagedElement>
</packagedElement>
</packagedElement>
- <packagedElement xmi:type="uml:Package" xmi:id="_tADfQAPMEdyuUt-4qHuVvQ" name="MARTE_DesignModel" clientDependency="_y9JiUA9dEdy-lroUn0KWEw">
+ <packagedElement xmi:type="uml:Package" xmi:id="_tADfQAPMEdyuUt-4qHuVvQ" clientDependency="_y9JiUA9dEdy-lroUn0KWEw" name="MARTE_DesignModel">
<packagedElement xmi:type="uml:Profile" xmi:id="_yNSZIAPMEdyuUt-4qHuVvQ" name="HLAM" metaclassReference="_rjz80EFdEd6UW4qJC-Vahw _TzV70EFeEd6UW4qJC-Vahw">
<eAnnotations xmi:id="_1R2rIJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML">
<contents xmi:type="ecore:EPackage" xmi:id="_b72QcbG3Ed-tmN4hwNCxXQ" name="HLAM" nsURI="http://www.eclipse.org/papyrus/HLAM/1" nsPrefix="HLAM">
@@ -2673,14 +2673,14 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72QerG3Ed-tmN4hwNCxXQ" name="srPoolPolicy" ordered="false" unique="false" eType="_b72QkLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72QfLG3Ed-tmN4hwNCxXQ" name="srPoolWaitingTime" ordered="false" unique="false" eType="_cygysLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QfrG3Ed-tmN4hwNCxXQ" name="operationalMode" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QgLG3Ed-tmN4hwNCxXQ" name="main" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72QgrG3Ed-tmN4hwNCxXQ" name="memorySize" ordered="false" unique="false" eType="_cyqjsLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QhLG3Ed-tmN4hwNCxXQ" name="base_BehavioredClassifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioredClassifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72QhrG3Ed-tmN4hwNCxXQ" name="queueSchedPolicy" ordered="false" unique="false" eType="_b72Qm7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72QiLG3Ed-tmN4hwNCxXQ" name="queueSize" ordered="false" unique="false" eType="_cyXowLG3Ed-tmN4hwNCxXQ"/>
@@ -2732,7 +2732,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72Qp7G3Ed-tmN4hwNCxXQ" name="concPolicy" ordered="false" unique="false" eType="_b72QrbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72QqbG3Ed-tmN4hwNCxXQ" name="memorySize" ordered="false" unique="false" eType="_cyqjsLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72Qq7G3Ed-tmN4hwNCxXQ" name="base_BehavioredClassifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioredClassifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b72QrbG3Ed-tmN4hwNCxXQ" name="CallConcurrencyKind">
@@ -2744,19 +2744,19 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b72QsrG3Ed-tmN4hwNCxXQ" name="RtFeature">
<eAnnotations xmi:id="_b72Qs7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_XsQskBHlEdy7mJMaejUq5Q"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QtLG3Ed-tmN4hwNCxXQ" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QtrG3Ed-tmN4hwNCxXQ" name="base_Message" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Message"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QuLG3Ed-tmN4hwNCxXQ" name="base_Signal" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Signal"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Signal"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QurG3Ed-tmN4hwNCxXQ" name="base_Port" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QvLG3Ed-tmN4hwNCxXQ" name="base_InvocationAction" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72QvrG3Ed-tmN4hwNCxXQ" name="specification" ordered="false" unique="false" lowerBound="1" upperBound="-1" eType="_b72QwLG3Ed-tmN4hwNCxXQ" volatile="true" transient="true" derived="true"/>
</eClassifiers>
@@ -2772,10 +2772,10 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72Q0LG3Ed-tmN4hwNCxXQ" name="miss" ordered="false" unique="false" eType="_c4oBwLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72Q0rG3Ed-tmN4hwNCxXQ" name="priority" ordered="false" unique="false" eType="_c468sLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72Q1LG3Ed-tmN4hwNCxXQ" name="base_Comment" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Comment"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72Q1rG3Ed-tmN4hwNCxXQ" name="context" ordered="false" volatile="true" transient="true" derived="true">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b72Q2LG3Ed-tmN4hwNCxXQ" name="MARTE_Library_MARTE_DataTypes_UtilityType" instanceClassName="java.lang.String">
@@ -2855,10 +2855,10 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72RQLG3Ed-tmN4hwNCxXQ" name="synchKind" ordered="false" unique="false" eType="_b72RNbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72RQrG3Ed-tmN4hwNCxXQ" name="msgSize" ordered="false" unique="false" eType="_cyqjsLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72RRLG3Ed-tmN4hwNCxXQ" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72RRrG3Ed-tmN4hwNCxXQ" name="base_InvocationAction" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b72RSLG3Ed-tmN4hwNCxXQ" name="ExecutionKind">
@@ -2880,7 +2880,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72RWLG3Ed-tmN4hwNCxXQ" name="isAtomic" ordered="false" unique="false" lowerBound="1" eType="_cxoB4LG3Ed-tmN4hwNCxXQ" defaultValueLiteral="false"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b72RWrG3Ed-tmN4hwNCxXQ" name="synchKind" ordered="false" unique="false" eType="_b72RNbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b72RXLG3Ed-tmN4hwNCxXQ" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_cxoB4LG3Ed-tmN4hwNCxXQ" name="Boolean" instanceClassName="java.lang.String">
@@ -2944,13 +2944,13 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2rKJi4Ed-m0Oaexd_lJA" name="srPoolSize" ordered="false" unique="false" eType="_5lYV0Ji4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2rKpi4Ed-m0Oaexd_lJA" name="srPoolPolicy" ordered="false" unique="false" eType="_1R2rQJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2rLpi4Ed-m0Oaexd_lJA" name="operationalMode" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2rMJi4Ed-m0Oaexd_lJA" name="main" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2rNJi4Ed-m0Oaexd_lJA" name="base_BehavioredClassifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioredClassifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2rNpi4Ed-m0Oaexd_lJA" name="queueSchedPolicy" ordered="false" unique="false" eType="_1R2r3pi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2rOJi4Ed-m0Oaexd_lJA" name="queueSize" ordered="false" unique="false" eType="_5lYV0Ji4Ed-m0Oaexd_lJA"/>
@@ -3060,7 +3060,7 @@
<eAnnotations xmi:id="_1R2r6Zi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_5cHkUBHjEdy7mJMaejUq5Q"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2r6pi4Ed-m0Oaexd_lJA" name="concPolicy" ordered="false" unique="false" eType="_1R2r8Ji4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2r7pi4Ed-m0Oaexd_lJA" name="base_BehavioredClassifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioredClassifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_5ndZcJi4Ed-m0Oaexd_lJA" name="memorySize" ordered="false" unique="false" eType="_5i_wMpi4Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -3073,19 +3073,19 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_1R2r9Zi4Ed-m0Oaexd_lJA" name="RtFeature">
<eAnnotations xmi:id="_1R2r9pi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_XsQskBHlEdy7mJMaejUq5Q"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2r95i4Ed-m0Oaexd_lJA" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2r-Zi4Ed-m0Oaexd_lJA" name="base_Message" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Message"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2r-5i4Ed-m0Oaexd_lJA" name="base_Signal" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Signal"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Signal"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2r_Zi4Ed-m0Oaexd_lJA" name="base_Port" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2r_5i4Ed-m0Oaexd_lJA" name="base_InvocationAction" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2sAZi4Ed-m0Oaexd_lJA" name="specification" ordered="false" unique="false" lowerBound="1" upperBound="-1" eType="_1R2sA5i4Ed-m0Oaexd_lJA" volatile="true" transient="true" derived="true"/>
</eClassifiers>
@@ -3093,10 +3093,10 @@
<eAnnotations xmi:id="_1R2sBJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_AZ8eMEFeEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2sCZi4Ed-m0Oaexd_lJA" name="tRef" ordered="false" unique="false" eType="_0zmpWZi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2sF5i4Ed-m0Oaexd_lJA" name="base_Comment" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Comment"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2sGZi4Ed-m0Oaexd_lJA" name="context" ordered="false" volatile="true" transient="true" derived="true">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_5rMC4Ji4Ed-m0Oaexd_lJA" name="utility" ordered="false" unique="false" eType="_5rMC4pi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_5rx4wJi4Ed-m0Oaexd_lJA" name="occKind" ordered="false" unique="false" eType="_5rx4wpi4Ed-m0Oaexd_lJA"/>
@@ -3168,10 +3168,10 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2s-Ji4Ed-m0Oaexd_lJA" name="isAtomic" ordered="false" unique="false" lowerBound="1" eType="_5kx44Ji4Ed-m0Oaexd_lJA" defaultValueLiteral="false"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2s-pi4Ed-m0Oaexd_lJA" name="synchKind" ordered="false" unique="false" eType="_1R2s75i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2s_pi4Ed-m0Oaexd_lJA" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2tAJi4Ed-m0Oaexd_lJA" name="base_InvocationAction" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_52EdMJi4Ed-m0Oaexd_lJA" name="msgSize" ordered="false" unique="false" eType="_5i_wMpi4Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -3194,7 +3194,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2tEpi4Ed-m0Oaexd_lJA" name="isAtomic" ordered="false" unique="false" lowerBound="1" eType="_5kx44Ji4Ed-m0Oaexd_lJA" defaultValueLiteral="false"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_1R2tFJi4Ed-m0Oaexd_lJA" name="synchKind" ordered="false" unique="false" eType="_1R2s75i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_1R2tFpi4Ed-m0Oaexd_lJA" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_5hpsYpi4Ed-m0Oaexd_lJA" name="NFP_Duration" instanceClassName="java.lang.String">
@@ -3254,61 +3254,61 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_4bAFkBHjEdy7mJMaejUq5Q" name="RtUnit">
<ownedAttribute xmi:id="_Uur9oBHkEdy7mJMaejUq5Q" name="isDynamic" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YOWicBHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YONYgBHkEdy7mJMaejUq5Q" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YOWicBHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_YOgTcBHkEdy7mJMaejUq5Q" value="true"/>
</ownedAttribute>
<ownedAttribute xmi:id="_VM7_4BHkEdy7mJMaejUq5Q" name="isMain" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_atWUcRHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_atWUcBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_atWUcRHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_atgFcBHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_VRaQMBHkEdy7mJMaejUq5Q" name="srPoolSize" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_czm2UBHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_czdsYBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_czm2UBHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_czwnUBHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_VVuvgBHkEdy7mJMaejUq5Q" name="srPoolPolicy" visibility="public" type="_FWK7gBHkEdy7mJMaejUq5Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f20IoBHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f2qXoBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f20IoBHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_f295oBHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_VZcx4BHkEdy7mJMaejUq5Q" name="srPoolWaitingTime" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i-V6QBHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i-MJQBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i-V6QBHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_i-fEMBHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_VdLbUBHkEdy7mJMaejUq5Q" name="operationalMode" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nb2AUBHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nbs2YBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nb2AUBHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nb2AURHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_VhWwsBHkEdy7mJMaejUq5Q" name="main" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p4wHoBHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p4m9sBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p4wHoBHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_p454oBHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_VkoHIBHkEdy7mJMaejUq5Q" name="memorySize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sj0mwRHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sj0mwBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sj0mwRHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sj-XwBHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
@@ -3318,24 +3318,24 @@
</ownedAttribute>
<ownedAttribute xmi:id="_IIBhAEFaEd6UW4qJC-Vahw" name="queueSchedPolicy" visibility="public" isUnique="false">
<type xmi:type="uml:Enumeration" href="MARTE_Library.library.uml#_4GfMYBFaEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OnamUEFaEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OnEoEEFaEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OnamUEFaEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NO-MsEFaEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_IWuEUEFaEd6UW4qJC-Vahw" name="queueSize" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SNZOgEFaEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SNSg0EFaEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SNZOgEFaEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_SNiYcEFaEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Ieh8gEFaEd6UW4qJC-Vahw" name="msgMaxSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V2KE8EFaEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V2AT8EFaEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V2KE8EFaEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_V2QyoEFaEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
@@ -3343,16 +3343,16 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_5cHkUBHjEdy7mJMaejUq5Q" name="PpUnit">
<ownedAttribute xmi:id="_7KPTABHjEdy7mJMaejUq5Q" name="concPolicy" visibility="public" type="_9CDJMBHjEdy7mJMaejUq5Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PdUxsBHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PdLAsBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PdUxsBHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_PdeisBHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_P4S2cBHkEdy7mJMaejUq5Q" name="memorySize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R_vrIBHkEdy7mJMaejUq5Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R_mhMBHkEdy7mJMaejUq5Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R_vrIBHkEdy7mJMaejUq5Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_R_vrIRHkEdy7mJMaejUq5Q">
<value xsi:nil="true"/>
</defaultValue>
@@ -3396,8 +3396,8 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
</ownedAttribute>
<ownedAttribute xmi:id="_yUZqYEFeEd6UW4qJC-Vahw" name="specification" type="_AZ8eMEFeEd6UW4qJC-Vahw" isUnique="false" isDerived="true" association="_yRuJ0EFeEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7BA1MEFeEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7AtTMEFeEd6UW4qJC-Vahw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7BA1MEFeEd6UW4qJC-Vahw" value="*"/>
<subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-ownedComment"/>
</ownedAttribute>
</packagedElement>
@@ -3420,21 +3420,21 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_CkIvYBH9EdyRosSELpiTmA" name="RtAction">
<ownedAttribute xmi:id="_DnV40BH9EdyRosSELpiTmA" name="isAtomic" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GQUGMRH9EdyRosSELpiTmA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GQUGMBH9EdyRosSELpiTmA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GQUGMRH9EdyRosSELpiTmA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GQd3MBH9EdyRosSELpiTmA" value="false"/>
</ownedAttribute>
<ownedAttribute xmi:id="_DxBZQBH9EdyRosSELpiTmA" name="synchKind" visibility="public" type="_nptJQBH8EdyRosSELpiTmA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IZ2lkBH9EdyRosSELpiTmA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IZtboBH9EdyRosSELpiTmA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IZ2lkBH9EdyRosSELpiTmA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_IaAWkBH9EdyRosSELpiTmA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_D1fpkBH9EdyRosSELpiTmA" name="msgSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LDbP4BH9EdyRosSELpiTmA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LDSF8BH9EdyRosSELpiTmA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LDbP4BH9EdyRosSELpiTmA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LDbP4RH9EdyRosSELpiTmA">
<value xsi:nil="true"/>
</defaultValue>
@@ -3464,28 +3464,28 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_gr5NIBH9EdyRosSELpiTmA" name="RtService">
<ownedAttribute xmi:id="_h2Z4cBH9EdyRosSELpiTmA" name="concPolicy" visibility="public" type="_ZcnjABH9EdyRosSELpiTmA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lLMC8BH9EdyRosSELpiTmA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lLC5ABH9EdyRosSELpiTmA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lLMC8BH9EdyRosSELpiTmA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_lLMC8RH9EdyRosSELpiTmA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_iJLqgBH9EdyRosSELpiTmA" name="exeKind" visibility="public" type="_RjxXcBH9EdyRosSELpiTmA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nuNZUBH9EdyRosSELpiTmA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nuDoUBH9EdyRosSELpiTmA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nuNZUBH9EdyRosSELpiTmA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nuNZURH9EdyRosSELpiTmA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_iNWY0BH9EdyRosSELpiTmA" name="isAtomic" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sLRagBH9EdyRosSELpiTmA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sLHpgBH9EdyRosSELpiTmA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sLRagBH9EdyRosSELpiTmA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sLRagRH9EdyRosSELpiTmA" value="false"/>
</ownedAttribute>
<ownedAttribute xmi:id="_iROMMBH9EdyRosSELpiTmA" name="synchKind" visibility="public" type="_nptJQBH8EdyRosSELpiTmA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uuI_4BH9EdyRosSELpiTmA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ut_O4BH9EdyRosSELpiTmA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uuI_4BH9EdyRosSELpiTmA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_uuI_4RH9EdyRosSELpiTmA">
<value xsi:nil="true"/>
</defaultValue>
@@ -3506,71 +3506,71 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_AZ8eMEFeEd6UW4qJC-Vahw" name="RtSpecification">
<ownedAttribute xmi:id="_GhcA4EFeEd6UW4qJC-Vahw" name="utility" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_4TENQBEBEdyx6M3BlUjlCQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YpbhAEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YpUzUEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YpbhAEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Ypi1wEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_GnciQEFeEd6UW4qJC-Vahw" name="occKind" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_VDec8BFXEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bU5owEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bUyUAEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bU5owEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bVAWcEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Gs5qAEFeEd6UW4qJC-Vahw" name="tRef" visibility="public" type="_noixsBD2EdyybZnLxHsjyA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_edDFcEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ec8XwEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_edDFcEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_edKaMEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_GyacIEFeEd6UW4qJC-Vahw" name="relDl" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hb8fgEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hb1KwEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hb8fgEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_hcD0QEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_G4GNYEFeEd6UW4qJC-Vahw" name="absDl" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_NIDGMBFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kJu7cEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kJecwEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kJu7cEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kJ2QMEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_G9sfEEFeEd6UW4qJC-Vahw" name="boundDl" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n9uxgEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n9ncwEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n9uxgEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_n937cEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_HDu1oEFeEd6UW4qJC-Vahw" name="rdTime" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rTFjwEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rS9A4EFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rTFjwEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_rTOtsEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_HJsTsEFeEd6UW4qJC-Vahw" name="miss" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_ZPC-IBFaEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tveGoEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tvKkoEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tveGoEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_tvn3oEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_HQWVUEFeEd6UW4qJC-Vahw" name="priority" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wfZQkEFeEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wfKAAEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wfZQkEFeEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_wfiagEFeEd6UW4qJC-Vahw">
<value xsi:nil="true"/>
</defaultValue>
@@ -3588,8 +3588,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_yRuJ0EFeEd6UW4qJC-Vahw" name="A_RtFeature_RtSpecification" memberEnd="_yUZqYEFeEd6UW4qJC-Vahw _yVOJwEFeEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_yVOJwEFeEd6UW4qJC-Vahw" name="rtFeature" type="_XsQskBHlEdy7mJMaejUq5Q" isUnique="false" association="_yRuJ0EFeEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yV2b4EFeEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yV6GQEFeEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yV2b4EFeEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -4213,23 +4213,23 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_j_oAkBJyEdygQ5HMNSpiZw" name="PLD_Organization">
<ownedAttribute xmi:id="_mjMJgBJyEdygQ5HMNSpiZw" name="nbRows" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pp5bwBJyEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ppvqwBJyEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pp5bwBJyEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_pp5bwRJyEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_mngo0BJyEdygQ5HMNSpiZw" name="nbColumns" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sZ0lsBJyEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sZq0sBJyEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sZ0lsBJyEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sZ0lsRJyEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_mqfEUBJyEdygQ5HMNSpiZw" name="class" visibility="public" type="_XMDncBJyEdygQ5HMNSpiZw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uFXhgBJyEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uFNwgBJyEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uFXhgBJyEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_uFhSgBJyEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
@@ -4239,83 +4239,83 @@
<generalization xmi:id="_XsBrgBJzEdygQ5HMNSpiZw" general="_NrpywBJzEdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_2rUqsBJyEdygQ5HMNSpiZw" name="architecture" visibility="public" isUnique="false" isDerived="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5eFGMBJyEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5d7VMBJyEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5eFGMBJyEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5eFGMRJyEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_2uwZMBJyEdygQ5HMNSpiZw" name="mips" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7qGR0BJyEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7p9H4BJyEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7qGR0BJyEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_7qQC0BJyEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_2yLgoBJyEdygQ5HMNSpiZw" name="ipc" visibility="public" isUnique="false" isDerived="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-CCZkBJyEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-B5PoBJyEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-CCZkBJyEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-CCZkRJyEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_22WO8BJyEdygQ5HMNSpiZw" name="nbCores" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Atf6QRJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Atf6QBJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Atf6QRJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_AtpEMBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_26XzUBJyEdygQ5HMNSpiZw" name="nbPipelines" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DHX7sBJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DHOKsBJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DHX7sBJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_DHhFoBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_2_SvkBJyEdygQ5HMNSpiZw" name="nbStages" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FYKSkBJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FYAhkBJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FYKSkBJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FYTcgBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_3Dmn0BJyEdygQ5HMNSpiZw" name="nbALUs" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H9WzMBJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H9NCMBJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H9WzMBJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_H9gkMBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_3HoMMBJyEdygQ5HMNSpiZw" name="nbFPUs" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kq5XgBJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KqvmgBJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kq5XgBJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_KrChcBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ezcksBJ0EdygQ5HMNSpiZw" name="ownedISAs" type="_HQmlcBJ0EdygQ5HMNSpiZw" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_ezSzsBJ0EdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e0CakRJ0EdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e0CakBJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e0CakRJ0EdygQ5HMNSpiZw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_frSLoBJ0EdygQ5HMNSpiZw" name="predictors" type="_UUddUBJ0EdygQ5HMNSpiZw" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_frIaoBJ0EdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fsBygBJ0EdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fr4BgBJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fsBygBJ0EdygQ5HMNSpiZw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_Blc8UBJ7Edyix70umlP_zg" name="caches" type="_z6yqgBJ3EdygFI18IOWZzA" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_BlKBYBJ7Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BmWUMRJ7Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BmWUMBJ7Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BmWUMRJ7Edyix70umlP_zg" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_0c0AMBJ8Edyix70umlP_zg" name="ownedMMUs" type="_JnXu4BJ8Edyix70umlP_zg" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_0chFQBJ8Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0dtYERJ8Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0dtYEBJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0dtYERJ8Edyix70umlP_zg" value="*"/>
</ownedAttribute>
<icon xmi:id="_r8U74HBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
<eAnnotations xmi:id="_sa35EHBWEd2Nss_u28cvSA" source="image_papyrus">
@@ -4328,8 +4328,8 @@
<generalization xmi:id="_XSGvoBJzEdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_PHjwEBJzEdygQ5HMNSpiZw" name="op_Frequencies" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_DaoHAB14EdyUAqqkOL30sg"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mFWhgBJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mFMwgBJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mFWhgBJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TSWVgBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
@@ -4351,50 +4351,50 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_goLuMBJzEdygQ5HMNSpiZw" name="HwPLD">
<generalization xmi:id="_GfCloBJ0EdygQ5HMNSpiZw" general="_NrpywBJzEdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_hwI0wBJzEdygQ5HMNSpiZw" name="technology" visibility="public" type="_QewpABJyEdygQ5HMNSpiZw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kD5nIBJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kDwdMBJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kD5nIBJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kEDYIBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_hzaLMBJzEdygQ5HMNSpiZw" name="organization" visibility="public" type="_j_oAkBJyEdygQ5HMNSpiZw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7UMd0BJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7UCs0BJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7UMd0BJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_7UVnwBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_h3R-kBJzEdygQ5HMNSpiZw" name="nbLUTs" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-qN-cBJzEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-qENcBJzEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-qN-cBJzEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-qXIYBJzEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_h7Jx8BJzEdygQ5HMNSpiZw" name="ndLUT_Inputs" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BfficBJ0EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BfWYgBJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BfficBJ0EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_BfficRJ0EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_h-4bYBJzEdygQ5HMNSpiZw" name="nbFlipFlops" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ewmt4BJ0EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ewdj8BJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ewmt4BJ0EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Ewmt4RJ0EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_AXPcwBJ7Edyix70umlP_zg" name="blocksRAM" type="_WSmywBJ5EdygFI18IOWZzA" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_AW8h0BJ7Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AYI0oRJ7Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AYI0oBJ7Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AYI0oRJ7Edyix70umlP_zg" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_sBjpUGqbEdyHVMM3AaZxvA" name="blocksComputing" type="_NrpywBJzEdygQ5HMNSpiZw" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_sAvxAGqbEdyHVMM3AaZxvA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sByS0GqbEdyHVMM3AaZxvA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sBxEsGqbEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sByS0GqbEdyHVMM3AaZxvA" value="*"/>
</ownedAttribute>
<icon xmi:id="_1WP4oHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%16%16%16%32%32%32%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%105%105%105%113%113%113%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-82%-82%-82%-74%-74%-74%-70%-70%-70%-66%-66%-66%-50%-50%-50%-46%-46%-46%-42%-42%-42%-38%-38%-38%-34%-34%-34%-30%-30%-30%-26%-26%-26%-22%-22%-22%-18%-18%-18%-14%-14%-14%-10%-10%-10%-6%-6%-6%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%65%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%-40%-80%65%-127%-117%24%51%106%-36%-88%-15%64%65%1%16%38%-120%28%73%-78%-92%-55%-111%15%4%16%-76%48%-128%98%65%7%8%8%54%72%-32%-110%-32%1%8%54%113%-42%20%24%-128%3%-63%-98%4%61%108%-72%-96%-63%-61%67%10%4%8%34%37%-56%-95%-24%-121%14%28%58%56%-100%41%-109%-90%-64%12%24%10%102%-56%0%66%-88%84%-124%55%9%22%-104%48%-80%-62%-63%11%24%46%92%-80%-112%-43%-96%-121%0%70%5%-66%-115%11%66%-61%65%13%18%62%8%-68%-96%-73%-32%-124%2%4%-1%14%-4%-80%97%96%-122%-66%27%-52%30%-34%-48%-105%-32%-126%5%-114%33%11%-4%96%-41%-32%6%9%82%63%96%104%60%112%-84%88%-78%3%45%28%-60%-112%-106%116%-27%-96%112%7%-50%37%72%90%107%-42%-89%116%3%3%30%24%-63%-128%65%-45%28%56%-96%-27%124%80%1%3%-126%9%26%32%-44%-112%-127%3%111%-124%4%40%16%76%-66%19%4%-121%0%76%-95%55%-121%-32%113%32%-11%-26%32%-126%3%23%-34%-100%121%103%0%-32%-61%-117%15%31%79%126%-68%74%-20%-24%-45%-85%95%-49%-66%-67%-63%-128%0%59%">
<eAnnotations xmi:id="_1-x4QHBWEd2Nss_u28cvSA" source="image_papyrus">
@@ -4406,23 +4406,23 @@
<generalization xmi:id="_cdO7QBJ0EdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_IL2FsBJ0EdygQ5HMNSpiZw" name="family" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KgrPEBJ0EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KgheEBJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KgrPEBJ0EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Kg1AEBJ0EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_IRMfwBJ0EdygQ5HMNSpiZw" name="inst_Width" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NlSPkBJ0EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NlIekBJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NlSPkBJ0EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NlcAkBJ0EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_IUUsQBJ0EdygQ5HMNSpiZw" name="type" visibility="public" type="_HVDSgBJyEdygQ5HMNSpiZw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PPGtEBJ0EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PO9jIBJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PPGtEBJ0EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_PPQeEBJ0EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
@@ -4433,38 +4433,38 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_ezSzsBJ0EdygQ5HMNSpiZw" name="Association_HwProcessor_HwISA" memberEnd="_ezcksBJ0EdygQ5HMNSpiZw _e0MLkBJ0EdygQ5HMNSpiZw">
<ownedEnd xmi:id="_e0MLkBJ0EdygQ5HMNSpiZw" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_ezSzsBJ0EdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e1FjcBJ0EdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e1FjcRJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e1FjcBJ0EdygQ5HMNSpiZw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_frIaoBJ0EdygQ5HMNSpiZw" name="Association_HwProcessor_HwBranchPredictor" memberEnd="_frSLoBJ0EdygQ5HMNSpiZw _fsBygRJ0EdygQ5HMNSpiZw">
<ownedEnd xmi:id="_fsBygRJ0EdygQ5HMNSpiZw" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_frIaoBJ0EdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fsxZYBJ0EdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fs7KYBJ0EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fsxZYBJ0EdygQ5HMNSpiZw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_AW8h0BJ7Edyix70umlP_zg" name="Association_HwPLD_HwRAM" memberEnd="_AXPcwBJ7Edyix70umlP_zg _AYR-kBJ7Edyix70umlP_zg">
<ownedEnd xmi:id="_AYR-kBJ7Edyix70umlP_zg" name="hwPLD" type="_goLuMBJzEdygQ5HMNSpiZw" isUnique="false" association="_AW8h0BJ7Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AZBlcBJ7Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AZBlcRJ7Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AZBlcBJ7Edyix70umlP_zg" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_BlKBYBJ7Edyix70umlP_zg" name="Association_HwProcessor_HWCache" memberEnd="_Blc8UBJ7Edyix70umlP_zg _BmgFMBJ7Edyix70umlP_zg">
<ownedEnd xmi:id="_BmgFMBJ7Edyix70umlP_zg" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_BlKBYBJ7Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BnF7EBJ7Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BnPsEBJ7Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BnF7EBJ7Edyix70umlP_zg" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_0chFQBJ8Edyix70umlP_zg" name="Association_HwProcessor_HwMMU" memberEnd="_0c0AMBJ8Edyix70umlP_zg _0d3JEBJ8Edyix70umlP_zg">
<ownedEnd xmi:id="_0d3JEBJ8Edyix70umlP_zg" name="hwProcessor" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_0chFQBJ8Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0ec-8BJ8Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0emv8BJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0ec-8BJ8Edyix70umlP_zg" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_sAvxAGqbEdyHVMM3AaZxvA" name="Association_HwPLD_HwComputingResource" memberEnd="_sBjpUGqbEdyHVMM3AaZxvA _sB0IAGqbEdyHVMM3AaZxvA">
<ownedEnd xmi:id="_sB0IAGqbEdyHVMM3AaZxvA" name="hwPLD" type="_goLuMBJzEdygQ5HMNSpiZw" isUnique="false" association="_sAvxAGqbEdyHVMM3AaZxvA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sCEmsGqbEdyHVMM3AaZxvA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sCF00GqbEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sCEmsGqbEdyHVMM3AaZxvA" value="1"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -4872,8 +4872,8 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_KryuYBJ-EdyT_7R0WVpWAw" name="HwArbiter">
<generalization xmi:id="_QFmEoBJ-EdyT_7R0WVpWAw" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
<ownedAttribute xmi:id="_U1bk8BKLEdy1B7_71Kp_8Q" name="controlledMedias" type="_Q4QQoBJ-EdyT_7R0WVpWAw" association="_U0-5ABKLEdy1B7_71Kp_8Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U2n3wRKLEdy1B7_71Kp_8Q" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U2n3wBKLEdy1B7_71Kp_8Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U2n3wRKLEdy1B7_71Kp_8Q" value="*"/>
</ownedAttribute>
<icon xmi:id="_6LQfwHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%12%12%12%28%28%28%44%44%44%48%48%48%64%64%64%80%80%80%93%93%93%97%97%97%101%101%101%109%109%109%113%113%113%125%125%125%-115%-115%-115%-103%-103%-103%-82%-82%-82%-66%-66%-66%-62%-62%-62%-54%-54%-54%-26%-26%-26%-18%-18%-18%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-47%0%45%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%66%8%13%34%74%-100%72%-79%-94%69%-119%11%6%40%96%-64%-79%-93%-57%-113%32%67%34%0%0%96%-64%4%10%40%83%-86%92%-55%-110%-27%-125%0%14%74%-98%108%73%-77%38%-123%4%2%36%88%-112%105%-77%-89%74%2%3%42%8%-28%-23%-45%-26%4%1%7%8%18%45%-38%-14%-91%-125%-126%75%-103%-86%-60%-87%19%-86%73%-87%43%-127%10%53%24%-107%-23%-47%-92%8%-69%-6%116%-86%80%-84%77%-86%11%-51%-46%-44%-54%80%-19%-54%-81%14%-35%-90%36%27%-9%-22%-39%-100%14%-121%-38%93%27%52%-81%-34%-103%44%-31%-6%-3%-37%20%-26%-32%-127%98%-47%30%38%-4%-77%-17%98%-58%20%4%63%102%76%119%50%97%-59%-106%-1%-78%-51%-116%120%64%0%2%17%66%-117%30%77%-70%-76%-23%8%0%10%20%48%-64%-70%-75%-21%-41%-80%99%-77%6%-53%-71%-74%109%-53%1%1%0%59%">
<eAnnotations xmi:id="_6le9oHBWEd2Nss_u28cvSA" source="image_papyrus">
@@ -4886,15 +4886,15 @@
<generalization xmi:id="_0w4pcBRCEdyCa-N9ek5e_w" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
<ownedAttribute xmi:id="_brZqIBJ-EdyT_7R0WVpWAw" name="bandWidth" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#__NI1EBFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eJL7MRJ-EdyT_7R0WVpWAw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eJL7MBJ-EdyT_7R0WVpWAw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eJL7MRJ-EdyT_7R0WVpWAw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_eJVFIBJ-EdyT_7R0WVpWAw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_U2xowBKLEdy1B7_71Kp_8Q" name="arbiters" type="_KryuYBJ-EdyT_7R0WVpWAw" association="_U0-5ABKLEdy1B7_71Kp_8Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U3XeoBKLEdy1B7_71Kp_8Q" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U3hPoBKLEdy1B7_71Kp_8Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U3XeoBKLEdy1B7_71Kp_8Q" value="*"/>
</ownedAttribute>
<icon xmi:id="_8p7hoHBWEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%8%8%8%16%16%16%24%24%24%32%32%32%48%48%48%64%64%64%72%72%72%80%80%80%97%97%97%105%105%105%113%113%113%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-91%-91%-91%-82%-82%-82%-66%-66%-66%-58%-58%-58%-50%-50%-50%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-79%0%49%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%35%36%-72%-72%-32%-127%65%2%5%46%34%16%112%-127%32%4%1%33%45%-114%108%64%-112%64%-125%1%11%98%-54%-100%73%-77%102%76%2%12%6%-108%-60%0%-31%-128%5%-101%64%-125%46%-96%-96%-128%37%6%2%19%48%14%-84%-96%-77%-89%82%-126%69%11%68%120%58%-112%-62%-128%6%10%-88%10%-60%122%97%64%5%-86%93%-65%98%-59%32%33%-126%-39%-77%104%-45%-86%61%-117%97%44%-122%-82%16%2%20%-104%75%-73%-82%-35%-69%115%5%56%-16%58%-80%1%72%-111%4%-78%14%-68%-128%82%36%-128%-81%4%27%24%-72%-104%64%112%65%-60%21%45%-20%-44%74%-71%-78%-27%-53%-104%51%107%110%24%16%0%59%">
<eAnnotations xmi:id="_9a8u4HBWEd2Nss_u28cvSA" source="image_papyrus">
@@ -4906,8 +4906,8 @@
<generalization xmi:id="_97r3ABRAEdyCa-N9ek5e_w" general="_cGRFcBGzEdyb1KzJ7GkiGA"/>
<generalization xmi:id="_iaOvUBRPEdyCa-N9ek5e_w" general="_tE4T4BJ9EdyT_7R0WVpWAw"/>
<ownedAttribute xmi:id="_iDcS4BRCEdyCa-N9ek5e_w" name="connectedTo" type="_Q4QQoBJ-EdyT_7R0WVpWAw" isUnique="false" association="_iDJX8BRCEdyCa-N9ek5e_w">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iEyWsBRCEdyCa-N9ek5e_w" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iEolsBRCEdyCa-N9ek5e_w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iEyWsBRCEdyCa-N9ek5e_w" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_U0-5ABKLEdy1B7_71Kp_8Q" name="Association_HwArbiter_HwMedia" memberEnd="_U1bk8BKLEdy1B7_71Kp_8Q _U2xowBKLEdy1B7_71Kp_8Q"/>
@@ -4915,32 +4915,32 @@
<generalization xmi:id="_LfsdQBKOEdy1B7_71Kp_8Q" general="_Q4QQoBJ-EdyT_7R0WVpWAw"/>
<ownedAttribute xmi:id="_8zvmMBKNEdy1B7_71Kp_8Q" name="adressWidth" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__YhQEBKNEdy1B7_71Kp_8Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__YXfEBKNEdy1B7_71Kp_8Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__YhQEBKNEdy1B7_71Kp_8Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__YrBEBKNEdy1B7_71Kp_8Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_881QwBKNEdy1B7_71Kp_8Q" name="wordWidth" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FH7C4BKOEdy1B7_71Kp_8Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FHxR4BKOEdy1B7_71Kp_8Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FH7C4BKOEdy1B7_71Kp_8Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FIEz4BKOEdy1B7_71Kp_8Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8_zsQBKNEdy1B7_71Kp_8Q" name="isSynchronous" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G5Tg8BKOEdy1B7_71Kp_8Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G5Jv8BKOEdy1B7_71Kp_8Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G5Tg8BKOEdy1B7_71Kp_8Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_G5cq4BKOEdy1B7_71Kp_8Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_9DOzsBKNEdy1B7_71Kp_8Q" name="isSerial" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JB6zQBKOEdy1B7_71Kp_8Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JBxpUBKOEdy1B7_71Kp_8Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JB6zQBKOEdy1B7_71Kp_8Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_JCEkQBKOEdy1B7_71Kp_8Q">
<value xsi:nil="true"/>
</defaultValue>
@@ -4954,8 +4954,8 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_MEDHgBKOEdy1B7_71Kp_8Q" name="HwBridge">
<generalization xmi:id="_O-b1ABKOEdy1B7_71Kp_8Q" general="_Q4QQoBJ-EdyT_7R0WVpWAw"/>
<ownedAttribute xmi:id="_VzQ-0BKOEdy1B7_71Kp_8Q" name="sides" type="_Q4QQoBJ-EdyT_7R0WVpWAw" isUnique="false" association="_Vyqh4BKOEdy1B7_71Kp_8Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V0AlsRKOEdy1B7_71Kp_8Q" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V0AlsBKOEdy1B7_71Kp_8Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V0AlsRKOEdy1B7_71Kp_8Q" value="*"/>
</ownedAttribute>
<icon xmi:id="_CJGgEHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%32%32%32%40%40%40%56%56%56%64%64%64%72%72%72%80%80%80%89%89%89%97%97%97%113%113%113%125%125%125%-123%-123%-123%-115%-115%-115%-99%-99%-99%-91%-91%-91%-74%-74%-74%-66%-66%-66%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-65%0%51%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-64%10%18%50%106%-36%-56%-79%99%-57%9%4%9%20%48%64%-78%-92%-55%-109%40%79%6%-80%48%112%64%5%-117%4%93%-74%124%9%83%-96%76%-101%52%107%-34%-52%-80%19%-26%-50%-98%22%127%-46%68%0%-96%-88%-47%-93%72%-113%10%-72%-128%115%102%-45%-120%55%-123%62%-123%24%53%103%85%-119%87%-97%2%109%-104%-107%39%-51%-83%12%-81%54%48%16%-32%107%1%5%24%28%-114%45%107%-77%-64%-126%8%4%36%12%-92%-96%64%-63%67%-72%114%5%82%48%-32%32%67%4%4%105%51%60%-80%11%-15%111%96%6%12%6%70%56%-112%1%66%-126%-119%-117%5%19%30%-8%-32%0%96%-118%-107%25%27%-116%16%-104%34%-25%-102%-96%67%-117%30%77%-70%-76%105%-121%1%1%0%59%">
<eAnnotations xmi:id="_Cm52YHBXEd2Nss_u28cvSA" source="image_papyrus">
@@ -4965,20 +4965,20 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_Vyqh4BKOEdy1B7_71Kp_8Q" name="Association_HwBridge_HwMedia" memberEnd="_VzQ-0BKOEdy1B7_71Kp_8Q _V0KWsBKOEdy1B7_71Kp_8Q">
<ownedEnd xmi:id="_V0KWsBKOEdy1B7_71Kp_8Q" name="hwBridge" type="_MEDHgBKOEdy1B7_71Kp_8Q" isUnique="false" association="_Vyqh4BKOEdy1B7_71Kp_8Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V0wMkBKOEdy1B7_71Kp_8Q" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V059kBKOEdy1B7_71Kp_8Q"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V0wMkBKOEdy1B7_71Kp_8Q" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_nsxaQBQ_EdyCa-N9ek5e_w" name="A_HwResource_HwEndPoint" memberEnd="_ntOGMBQ_EdyCa-N9ek5e_w _nut7ARQ_EdyCa-N9ek5e_w">
<ownedEnd xmi:id="_nut7ARQ_EdyCa-N9ek5e_w" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" isUnique="false" association="_nsxaQBQ_EdyCa-N9ek5e_w">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nv6N0BQ_EdyCa-N9ek5e_w" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nwDXwBQ_EdyCa-N9ek5e_w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nv6N0BQ_EdyCa-N9ek5e_w" value="1"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_iDJX8BRCEdyCa-N9ek5e_w" name="Association_HwEndPoint_HwMedia" memberEnd="_iDcS4BRCEdyCa-N9ek5e_w _iEyWsRRCEdyCa-N9ek5e_w">
<ownedEnd xmi:id="_iEyWsRRCEdyCa-N9ek5e_w" name="hwEndPoint" type="_-ZhPABJ-EdyT_7R0WVpWAw" isUnique="false" association="_iDJX8BRCEdyCa-N9ek5e_w">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iF04gBRCEdyCa-N9ek5e_w" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iF-pgBRCEdyCa-N9ek5e_w"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iF04gBRCEdyCa-N9ek5e_w" value="*"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -5346,23 +5346,23 @@
<generalization xmi:id="_08t4MBKQEdyCSNtdGzMSGg" general="_gVCpkBKQEdyCSNtdGzMSGg"/>
<ownedAttribute xmi:id="_twN1QBKQEdyCSNtdGzMSGg" name="nbCounters" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xDBp0BKQEdyCSNtdGzMSGg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xC340BKQEdyCSNtdGzMSGg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xDBp0BKQEdyCSNtdGzMSGg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_xDKzwBKQEdyCSNtdGzMSGg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_t-9b4BKQEdyCSNtdGzMSGg" name="counterWidth" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_znM2wBKQEdyCSNtdGzMSGg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_znDFwBKQEdyCSNtdGzMSGg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_znM2wBKQEdyCSNtdGzMSGg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_znWnwBKQEdyCSNtdGzMSGg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_3KZQsBKQEdyCSNtdGzMSGg" name="inputClock" type="_l5QgEBKQEdyCSNtdGzMSGg" isUnique="false" association="_3KGVwBKQEdyCSNtdGzMSGg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7ykVsBKQEdyCSNtdGzMSGg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7ybLwBKQEdyCSNtdGzMSGg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7ykVsBKQEdyCSNtdGzMSGg" value="1"/>
</ownedAttribute>
<icon xmi:id="_Wm4L0HBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%8%8%8%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%40%40%40%48%48%48%56%56%56%64%64%64%72%72%72%80%80%80%85%85%85%89%89%89%97%97%97%105%105%105%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-34%-34%-34%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%75%8%28%72%80%32%8%5%8%19%62%40%-56%-80%97%-61%12%11%58%72%-108%8%-64%-95%69%-121%25%6%88%24%24%-95%-30%-59%-113%3%73%72%104%48%16%-64%7%-112%40%65%52%40%-112%16%0%-123%-109%40%27%-110%-72%96%-32%-128%4%12%19%47%80%64%64%-128%2%-119%-104%3%57%28%-120%16%-62%-94%8%10%6%50%0%-67%-80%-96%104%65%17%12%69%60%-120%-128%50%2%85%-122%33%14%56%100%-6%-45%-30%-123%-85%88%13%88%-60%0%-63%98%7%5%22%67%-120%-75%24%-31%-126%67%4%48%27%-118%32%112%-111%-124%1%-88%5%-65%126%-12%-24%21%-20%-64%3%32%-10%126%36%65%96%4%65%16%90%5%127%116%-96%-127%96%-123%9%32%-7%90%-44%-32%-128%-32%3%-91%-118%47%126%64%64%80%65%-121%-56%32%71%8%32%104%-64%-23%69%1%113%45%74%78%-32%1%36%-120%4%24%-22%6%32%-56%24%37%9%8%14%12%55%68%76%112%66%5%-96%26%18%-92%14%-70%-128%-32%89%-96%37%94%99%38%8%33%54%65%2%120%99%-50%100%88%-70%96%91%-28%13%55%48%96%56%-30%64%116%-20%2%-31%54%70%36%11%126%96%-122%-123%14%107%-125%-9%-96%-96%-85%76%5%-115%-111%123%64%-16%93%-90%3%-97%49%47%40%-88%111%17%-23%114%-121%27%12%-27%30%74%82%9%-16%-128%6%-83%9%-12%-63%6%16%16%-64%64%96%-27%-115%-112%-127%3%9%0%96%33%2%12%96%-64%95%65%1%1%0%59%">
<eAnnotations xmi:id="_XJctYHBXEd2Nss_u28cvSA" source="image_papyrus">
@@ -5372,8 +5372,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_3KGVwBKQEdyCSNtdGzMSGg" name="Association_HwTimer_HwClock" memberEnd="_3KZQsBKQEdyCSNtdGzMSGg _3LcZkBKQEdyCSNtdGzMSGg">
<ownedEnd xmi:id="_3LcZkBKQEdyCSNtdGzMSGg" name="hwTimer" type="_sX3iQBKQEdyCSNtdGzMSGg" isUnique="false" association="_3KGVwBKQEdyCSNtdGzMSGg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3MMAcBKQEdyCSNtdGzMSGg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3MVKYBKQEdyCSNtdGzMSGg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3MMAcBKQEdyCSNtdGzMSGg" value="*"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -6247,31 +6247,31 @@
<generalization xmi:id="_XIf1wBJ1EdygQ5HMNSpiZw" general="_LDER0BJxEdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_N7DOwBJ1EdygQ5HMNSpiZw" name="memorySize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QMZmUBJ1EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QMP1UBJ1EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QMZmUBJ1EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_QMiwQBJ1EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OIAFoBJ1EdygQ5HMNSpiZw" name="adressSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SsVzgBJ1EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SsMpkBJ1EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SsVzgBJ1EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_SsfkgBJ1EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OMeV8BJ1EdygQ5HMNSpiZw" name="timings" visibility="public" type="_DGwlwBJ1EdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UvsyYBJ1EdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UvjBYBJ1EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UvsyYBJ1EdygQ5HMNSpiZw" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Uv18UBJ1EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_PRVNIDL3Ed2HYNz2hI9A2g" name="throughput" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#__NI1EBFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q_KA4DL3Ed2HYNz2hI9A2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q-3F8DL3Ed2HYNz2hI9A2g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q_KA4DL3Ed2HYNz2hI9A2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Q_Tx4DL3Ed2HYNz2hI9A2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -6285,24 +6285,24 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_DGwlwBJ1EdygQ5HMNSpiZw" name="Timing">
<ownedAttribute xmi:id="_EhJgIBJ1EdygQ5HMNSpiZw" name="notation" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GfjtkBJ1EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GfajoBJ1EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GfjtkBJ1EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GfjtkRJ1EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_EkknkBJ1EdygQ5HMNSpiZw" name="description" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JjhN0BJ1EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JjXc0BJ1EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JjhN0BJ1EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_JjqXwBJ1EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_EnjDEBJ1EdygQ5HMNSpiZw" name="value" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MACTkBJ1EdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L_4ikBJ1EdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MACTkBJ1EdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_MALdgBJ1EdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
@@ -6341,24 +6341,24 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_BJiOoBJ2Edy4d8Ako8RhiQ" name="CacheStructure">
<ownedAttribute xmi:id="_Cy-4sBJ2Edy4d8Ako8RhiQ" name="nbSets" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ExudUBJ2Edy4d8Ako8RhiQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ExksUBJ2Edy4d8Ako8RhiQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ExudUBJ2Edy4d8Ako8RhiQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ExudURJ2Edy4d8Ako8RhiQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_C_MvwBJ2Edy4d8Ako8RhiQ" name="blockSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ksPKEB_HEdyCRb8Vh0lIfg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ksC80B_HEdyCRb8Vh0lIfg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ksPKEB_HEdyCRb8Vh0lIfg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_H4jEUBJ2Edy4d8Ako8RhiQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_DEHE8BJ2Edy4d8Ako8RhiQ" name="associativity" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LvL-sBJ2Edy4d8Ako8RhiQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LvCNsBJ2Edy4d8Ako8RhiQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LvL-sBJ2Edy4d8Ako8RhiQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LvVvsBJ2Edy4d8Ako8RhiQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -6367,32 +6367,32 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_OUWqIBJ2Edy4d8Ako8RhiQ" name="MemoryOrganization">
<ownedAttribute xmi:id="_Sy55EBJ2Edy4d8Ako8RhiQ" name="nbRows" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VBvIIRJ2Edy4d8Ako8RhiQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VBvIIBJ2Edy4d8Ako8RhiQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VBvIIRJ2Edy4d8Ako8RhiQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_VB4SEBJ2Edy4d8Ako8RhiQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_S2exgBJ2Edy4d8Ako8RhiQ" name="nbColumns" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Xr95wBJ2Edy4d8Ako8RhiQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Xr0IwBJ2Edy4d8Ako8RhiQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Xr95wBJ2Edy4d8Ako8RhiQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_XsHDsBJ2Edy4d8Ako8RhiQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_S5wH8BJ2Edy4d8Ako8RhiQ" name="nbBanks" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aJ1qYBJ2Edy4d8Ako8RhiQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aJr5YBJ2Edy4d8Ako8RhiQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aJ1qYBJ2Edy4d8Ako8RhiQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_aJ1qYRJ2Edy4d8Ako8RhiQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_S9L2cBJ2Edy4d8Ako8RhiQ" name="wordSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_chAWEBJ2Edy4d8Ako8RhiQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cg2lEBJ2Edy4d8Ako8RhiQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_chAWEBJ2Edy4d8Ako8RhiQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_chKHEBJ2Edy4d8Ako8RhiQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -6402,36 +6402,36 @@
<generalization xmi:id="_D8PU4BJ4EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_1EOXwBJ3EdygFI18IOWZzA" name="level" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3pP5QBJ3EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3pGIQBJ3EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3pP5QBJ3EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_3pZDMBJ3EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_1ShScBJ3EdygFI18IOWZzA" name="type" visibility="public" type="_xj2TMBJ1Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6OaksBJ3EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6ORawBJ3EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6OaksBJ3EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6OkVsBJ3EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_1bm9ABJ3EdygFI18IOWZzA" name="structure" visibility="public" type="_BJiOoBJ2Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8JvB4BJ3EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8Jl38BJ3EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8JvB4BJ3EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8J4y4BJ3EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_1g0NIBJ3EdygFI18IOWZzA" name="repl_Policy" visibility="public" type="_jpkJoBJ1Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__NvlcBJ3EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__Nl0cBJ3EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__NvlcBJ3EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__N4vYBJ3EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_1k-7cBJ3EdygFI18IOWZzA" name="writePolicy" visibility="public" type="_qkeGQBJ1Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BXqfUBJ4EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BXguUBJ4EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BXqfUBJ4EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_BXzpQBJ4EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
@@ -6445,46 +6445,46 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WSmywBJ5EdygFI18IOWZzA" name="HwRAM">
<generalization xmi:id="_rm520BJ5EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_XnilYBJ5EdygFI18IOWZzA" name="organization" visibility="public" type="_OUWqIBJ2Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eLSmQBJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eLJcUBJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eLSmQBJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_eLcXQBJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Xs6NkBJ5EdygFI18IOWZzA" name="isSynchronous" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gZ5L0BJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gZva0BJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gZ5L0BJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gaCVwBJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Xx0iwBJ5EdygFI18IOWZzA" name="isStatic" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i6EpkBJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i564kBJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i6EpkBJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_i6OakBJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_X1s9MBJ5EdygFI18IOWZzA" name="isNonVolatile" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lPrPABJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lPheABJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lPrPABJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_lP1AABJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_X53rgBJ5EdygFI18IOWZzA" name="repl_Policy" visibility="public" type="_jpkJoBJ1Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nO7J8BJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nOyAABJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nO7J8BJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nPE68BJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_X9mU8BJ5EdygFI18IOWZzA" name="writePolicy" visibility="public" type="_qkeGQBJ1Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pc7SkBJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pcyIoBJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pc7SkBJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_pdFDkBJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
@@ -6498,15 +6498,15 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_sCeYgBJ5EdygFI18IOWZzA" name="HwROM">
<generalization xmi:id="_1SLCQBJ5EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_tLyJ8BJ5EdygFI18IOWZzA" name="type" visibility="public" type="_3_LX4BJ1Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wPbhIBJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wPRwIBJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wPbhIBJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_wPbhIRJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_tS760BJ5EdygFI18IOWZzA" name="organization" visibility="public" type="_OUWqIBJ2Edy4d8Ako8RhiQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y3z4oBJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y3qHoBJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y3z4oBJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_y39CkBJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
@@ -6521,15 +6521,15 @@
<generalization xmi:id="_R366sBJ6EdygFI18IOWZzA" general="_A9LDEBJ1EdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_2QnAcBJ5EdygFI18IOWZzA" name="sectorSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5baIgRJ5EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5baIgBJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5baIgRJ5EdygFI18IOWZzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5bj5gBJ5EdygFI18IOWZzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_7x5ewBJ5EdygFI18IOWZzA" name="buffer" type="_WSmywBJ5EdygFI18IOWZzA" isUnique="false" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_7xwU0BJ5EdygFI18IOWZzA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AKcMUBJ6EdygFI18IOWZzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AKSbUBJ6EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AKcMUBJ6EdygFI18IOWZzA" value="1"/>
</ownedAttribute>
<icon xmi:id="_l4jmIHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%80%80%80%89%89%89%93%93%93%97%97%97%105%105%105%113%113%113%121%121%121%125%125%125%-127%-127%-127%-123%-123%-123%-119%-119%-119%-115%-115%-115%-107%-107%-107%-103%-103%-103%-99%-99%-99%-95%-95%-95%-91%-91%-91%-86%-86%-86%-82%-82%-82%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-54%-54%-54%-50%-50%-50%-42%-42%-42%-34%-34%-34%-30%-30%-30%-26%-26%-26%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%99%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%11%-102%-56%96%-31%-63%3%1%0%50%2%-80%88%33%3%9%24%14%81%76%16%16%33%-125%-121%19%39%64%14%68%9%34%-125%4%1%18%68%40%68%-79%-96%-127%8%-107%14%73%76%56%64%-62%32%-116%10%13%84%68%36%-56%66%66%-124%23%3%97%72%0%49%-12%-96%-119%7%72%99%76%-112%-39%-12%32%-118%7%48%76%68%-88%-102%-16%66%-121%10%76%-71%30%84%-79%96%-128%9%-79%7%95%0%8%-64%1%-83%65%21%107%29%-72%45%120%97%-19%2%-86%115%-81%102%4%-79%116%-18%83%-75%1%32%-4%-116%-80%-126%-85%-117%10%71%59%0%24%32%64%-96%-119%4%18%-50%66%68%81%-31%64%-40%4%0%14%0%-96%48%-112%68%4%2%18%50%-96%100%81%-48%5%-54%13%19%10%52%0%-95%-78%68%-58%4%33%2%112%30%-8%-126%68%6%-117%-102%55%98%44%96%17%-125%8%23%4%53%0%0%1%64%2%-119%22%1%6%-92%80%-104%50%97%11%3%0%80%-80%56%-32%-63%-126%-64%7%0%8%124%-120%104%2%-6%1%-112%32%42%-64%126%88%80%56%-122%11%6%25%65%99%-40%110%112%68%-122%-44%25%15%-96%16%8%-29%0%112%21%15%72%15%12%-95%0%-93%-58%-75%-1%-83%-123%-128%6%4%-67%-16%-128%100%49%-80%-80%-64%6%9%-95%-64%-127%5%-94%37%4%66%2%-13%21%-120%-63%1%29%68%-11%16%12%32%44%80%1%112%7%-79%112%65%1%18%116%112%-62%66%40%120%-112%90%5%66%45%4%3%9%23%96%-105%-103%69%25%68%-16%0%102%0%52%96%-127%8%26%70%-60%2%74%25%-104%112%66%121%115%21%105%-28%-111%4%5%4%0%59%">
<eAnnotations xmi:id="_mk9ZIHBXEd2Nss_u28cvSA" source="image_papyrus">
@@ -6539,8 +6539,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_7xwU0BJ5EdygFI18IOWZzA" name="Association_Stereotype_0_HwRAM" memberEnd="_7x5ewBJ5EdygFI18IOWZzA _7y8AkBJ5EdygFI18IOWZzA">
<ownedEnd xmi:id="_7y8AkBJ5EdygFI18IOWZzA" name="stereotype_0" type="_14BhUBJ5EdygFI18IOWZzA" isUnique="false" association="_7xwU0BJ5EdygFI18IOWZzA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7z1YcBJ5EdygFI18IOWZzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7z_JcBJ5EdygFI18IOWZzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7z1YcBJ5EdygFI18IOWZzA" value="*"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -6995,8 +6995,8 @@
<generalization xmi:id="_mWsPgBJ7Edyix70umlP_zg" general="_Sh-rwBGzEdyb1KzJ7GkiGA"/>
<generalization xmi:id="_mzcc8BJ7Edyix70umlP_zg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_rkGIgBJ7Edyix70umlP_zg" name="managedMemories" type="_A9LDEBJ1EdygQ5HMNSpiZw" isUnique="false" association="_rjzNkBJ7Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rk2WcBJ7Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rkslcBJ7Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rk2WcBJ7Edyix70umlP_zg" value="*"/>
</ownedAttribute>
<icon xmi:id="_p8ZPAHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
<eAnnotations xmi:id="_qeXToHBXEd2Nss_u28cvSA" source="image_papyrus">
@@ -7006,8 +7006,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_rjzNkBJ7Edyix70umlP_zg" name="Association_HwStorageManager_HwMemory" memberEnd="_rkGIgBJ7Edyix70umlP_zg _rk2WcRJ7Edyix70umlP_zg">
<ownedEnd xmi:id="_rk2WcRJ7Edyix70umlP_zg" name="hwStorageManager" type="_h_XC4BJ7Edyix70umlP_zg" isUnique="false" association="_rjzNkBJ7Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rll9UBJ7Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rlvHQBJ7Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rll9UBJ7Edyix70umlP_zg" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_ycxQgBJ7Edyix70umlP_zg" name="HwDMA">
@@ -7015,23 +7015,23 @@
<generalization xmi:id="_Ljr6gBKQEdyCSNtdGzMSGg" general="_KryuYBJ-EdyT_7R0WVpWAw"/>
<ownedAttribute xmi:id="_0KHjIBJ7Edyix70umlP_zg" name="nbChannels" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_23E4oBJ7Edyix70umlP_zg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_227usBJ7Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_23E4oBJ7Edyix70umlP_zg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_23E4oRJ7Edyix70umlP_zg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_0OlzcBJ7Edyix70umlP_zg" name="transferWidth" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8M-mUBJ7Edyix70umlP_zg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8M01UBJ7Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8M-mUBJ7Edyix70umlP_zg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8NHwQBJ7Edyix70umlP_zg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_EFjsIBJ8Edyix70umlP_zg" name="drivenBy" type="_z0aH8BJyEdygQ5HMNSpiZw" isUnique="false" association="_EFZ7IBJ8Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EGAYEBJ8Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EF2nEBJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EGAYEBJ8Edyix70umlP_zg" value="*"/>
</ownedAttribute>
<icon xmi:id="_t1zwkHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
<eAnnotations xmi:id="_uUf3sHBXEd2Nss_u28cvSA" source="image_papyrus">
@@ -7041,47 +7041,47 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_EFZ7IBJ8Edyix70umlP_zg" name="Association_HwDMA_HwProcessor" memberEnd="_EFjsIBJ8Edyix70umlP_zg _EGAYERJ8Edyix70umlP_zg">
<ownedEnd xmi:id="_EGAYERJ8Edyix70umlP_zg" name="hwDMA" type="_ycxQgBJ7Edyix70umlP_zg" isUnique="false" association="_EFZ7IBJ8Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EGmN8BJ8Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EGv-8BJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EGmN8BJ8Edyix70umlP_zg" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_JnXu4BJ8Edyix70umlP_zg" name="HwMMU">
<generalization xmi:id="_bZ_b8BJ8Edyix70umlP_zg" general="_h_XC4BJ7Edyix70umlP_zg"/>
<ownedAttribute xmi:id="_L_66oBJ8Edyix70umlP_zg" name="virtualAddrSpace" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Pg344BJ8Edyix70umlP_zg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Pguu8BJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Pg344BJ8Edyix70umlP_zg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_PhBp4BJ8Edyix70umlP_zg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_MDpkEBJ8Edyix70umlP_zg" name="physicalAddrSpace" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UaUUEBJ8Edyix70umlP_zg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UaLKIBJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UaUUEBJ8Edyix70umlP_zg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UaeFEBJ8Edyix70umlP_zg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_MTcTkBJ8Edyix70umlP_zg" name="memoryProtection" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WxYSEBJ8Edyix70umlP_zg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WxPIIBJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WxYSEBJ8Edyix70umlP_zg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_WxiDEBJ8Edyix70umlP_zg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_MWH0IBJ8Edyix70umlP_zg" name="nbEntries" visibility="public" isUnique="false" isDerived="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZC7d8BJ8Edyix70umlP_zg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZCxs8BJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZC7d8BJ8Edyix70umlP_zg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ZDFO8BJ8Edyix70umlP_zg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_gO9m0BJ8Edyix70umlP_zg" name="ownedTLBs" type="_z6yqgBJ3EdygFI18IOWZzA" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_gO0c4BJ8Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gPtNsRJ8Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gPtNsBJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gPtNsRJ8Edyix70umlP_zg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_d5fz8KknEd-P4YTdFXh-JA" value=""/>
</ownedAttribute>
<icon xmi:id="_wT48kHBXEd2Nss_u28cvSA" content="71%73%70%56%57%97%33%0%33%0%112%0%0%44%0%0%0%0%33%0%33%0%-121%0%0%0%4%4%4%8%8%8%12%12%12%16%16%16%20%20%20%24%24%24%28%28%28%32%32%32%36%36%36%40%40%40%44%44%44%48%48%48%52%52%52%56%56%56%60%60%60%64%64%64%68%68%68%72%72%72%76%76%76%80%80%80%85%85%85%89%89%89%97%97%97%101%101%101%105%105%105%109%109%109%113%113%113%117%117%117%121%121%121%125%125%125%-123%-123%-123%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-78%-78%-78%-74%-74%-74%-66%-66%-66%-58%-58%-58%-50%-50%-50%-42%-42%-42%-38%-38%-38%-34%-34%-34%-26%-26%-26%-22%-22%-22%-18%-18%-18%-10%-10%-10%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%97%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%33%-62%14%16%34%74%-100%72%-79%-94%69%-119%23%16%-116%48%-63%-79%-93%-57%-113%32%67%114%4%-128%96%-123%-61%-109%48%72%-102%68%-72%-126%-93%-121%-105%47%57%-78%80%-88%-46%-96%11%17%16%16%68%-124%-7%50%-94%1%8%34%92%28%-84%57%-112%-59%5%3%23%76%44%52%113%-127%-128%-123%-103%4%-119%-62%40%-95%64%-60%11%-108%35%20%-108%-120%90%82%96%9%10%66%81%10%116%65%97%-85%-64%-102%44%20%-124%21%43%-16%-123%-126%-107%53%65%108%96%91%-16%67%-121%-77%93%21%100%-96%75%80%-125%2%-68%38%19%60%-32%59%80%66%2%-64%48%18%4%72%65%120%69%-128%-61%41%-69%22%-120%120%-126%-18%-119%-120%5%16%31%40%-80%-62%65%-46%-109%40%50%56%88%-111%32%115%100%-109%19%0%-88%-128%-127%19%-63%6%19%87%13%-66%48%-79%1%1%-125%16%48%90%0%-112%-128%-8%66%2%1%-85%97%-84%0%1%65%0%-128%-97%62%1%8%-128%0%98%-91%10%1%9%46%32%-18%-16%-127%2%-128%8%107%5%-78%-24%8%-107%96%106%10%114%17%-93%-123%96%0%-125%-124%113%2%-46%21%98%32%-96%-100%4%12%9%102%-119%110%0%33%80%-123%-125%0%0%0%4%24%-128%96%1%-126%1%-8%-23%-25%64%101%48%-124%-80%23%98%2%93%112%65%119%41%112%80%65%3%7%16%112%64%3%21%112%-64%-40%88%10%114%-75%-110%64%34%32%96%-63%8%-79%37%-12%-62%8%22%24%32%66%65%82%-75%69%34%122%49%121%-12%-110%5%78%-127%104%80%-118%4%-67%32%66%79%19%-67%36%35%66%52%18%-90%-95%-113%60%66%-112%-33%-112%68%22%105%-28%-111%68%34%0%-28%-110%76%54%9%67%64%0%59%">
@@ -7092,8 +7092,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_gO0c4BJ8Edyix70umlP_zg" name="Association_HwMMU_HWCache" memberEnd="_gO9m0BJ8Edyix70umlP_zg _gP2-sBJ8Edyix70umlP_zg">
<ownedEnd xmi:id="_gP2-sBJ8Edyix70umlP_zg" name="hwMMU" type="_JnXu4BJ8Edyix70umlP_zg" isUnique="false" association="_gO0c4BJ8Edyix70umlP_zg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gQwWkBJ8Edyix70umlP_zg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gQwWkRJ8Edyix70umlP_zg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gQwWkBJ8Edyix70umlP_zg" value="*"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -7600,98 +7600,98 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_ybY5ABKSEdyXTt3sy29HXg" name="HwComponent">
<generalization xmi:id="_IMc8IBKUEdyXTt3sy29HXg" general="_LDER0BJxEdygQ5HMNSpiZw"/>
<ownedAttribute xmi:id="_0lpKEBKSEdyXTt3sy29HXg" name="kind" visibility="public" type="_5j3-oBKSEdyXTt3sy29HXg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4_OZcBKSEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4_EocBKSEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4_OZcBKSEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_4_XjYBKSEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_0o7HkBKSEdyXTt3sy29HXg" name="dimensions" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_g4VH4BFTEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vcCWgBKTEdyXTt3sy29HXg" value="3"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vb4lgBKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vcCWgBKTEdyXTt3sy29HXg" value="3"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_vcVRcBKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_0sNFEBKSEdyXTt3sy29HXg" name="area" visibility="public" isUnique="false" isDerived="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KmCwBFTEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xw3f4BKTEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xwuV8BKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xw3f4BKTEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_xxBQ4BKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_0vVRkBKSEdyXTt3sy29HXg" name="position" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_rq2FsB18EdyUAqqkOL30sg"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1RYZQBKTEdyXTt3sy29HXg" value="2"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1RPPUBKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1RYZQBKTEdyXTt3sy29HXg" value="2"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_1RiKQBKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_0zW18BKSEdyXTt3sy29HXg" name="grid" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_383IEBKTEdyXTt3sy29HXg" value="2"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_38tXEBKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_383IEBKTEdyXTt3sy29HXg" value="2"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_39A5EBKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_030fMBKSEdyXTt3sy29HXg" name="nbPins" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Asy1gBFIEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6UrUABKTEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6UhjABKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6UrUABKTEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6U0d8BKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_07ZXoBKSEdyXTt3sy29HXg" name="weight" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ACRwABKUEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ACH_ABKUEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ACRwABKUEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ACa58BKUEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_0_RLABKSEdyXTt3sy29HXg" name="price" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_TyXpQDJQEd211cMdxu944g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CnfewBKUEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CnWU0BKUEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CnfewBKUEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_CnpPwBKUEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_1DJlcBKSEdyXTt3sy29HXg" name="r_Conditions" visibility="public" type="_NRvQYBKTEdyXTt3sy29HXg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FlmOoBKUEdyXTt3sy29HXg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FlcdoBKUEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FlmOoBKUEdyXTt3sy29HXg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FlvYkBKUEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_6oa58BKUEdyxaob5agZuXg" name="poweredServices" type="_LTvyIBJxEdygQ5HMNSpiZw" aggregation="composite" redefinedProperty="_Wf6voBJxEdygQ5HMNSpiZw" association="_6oH_ABKUEdyxaob5agZuXg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6peC0BKUEdyxaob5agZuXg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6pUR0BKUEdyxaob5agZuXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6peC0BKUEdyxaob5agZuXg" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_JLuyYBKVEdyxaob5agZuXg" name="staticConsumption" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mgu_UBKVEdyxaob5agZuXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MglOUBKVEdyxaob5agZuXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Mgu_UBKVEdyxaob5agZuXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Mg4wUBKVEdyxaob5agZuXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_JTb84BKVEdyxaob5agZuXg" name="staticDissipation" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P4j2wBKVEdyxaob5agZuXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P4aFwBKVEdyxaob5agZuXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P4j2wBKVEdyxaob5agZuXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_P4tAsBKVEdyxaob5agZuXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_oxuScGqqEdyHVMM3AaZxvA" name="subComponents" type="_ybY5ABKSEdyXTt3sy29HXg" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_oxqoEGqqEdyHVMM3AaZxvA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ox8U4GqqEdyHVMM3AaZxvA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ox7GwGqqEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ox8U4GqqEdyHVMM3AaZxvA" value="*"/>
</ownedAttribute>
<icon xmi:id="_Op-xQHBYEd2Nss_u28cvSA" content="71%73%70%56%57%97%-127%0%-127%0%112%0%0%44%0%0%0%0%-127%0%-127%0%-121%0%0%0%4%4%4%16%16%16%20%20%20%24%24%24%32%32%32%36%36%36%40%40%40%48%48%48%64%64%64%72%72%72%80%80%80%97%97%97%113%113%113%121%121%121%-115%-115%-115%-107%-107%-107%-99%-99%-99%-91%-91%-91%-82%-82%-82%-66%-66%-66%-58%-58%-58%-34%-34%-34%-26%-26%-26%-18%-18%-18%-1%-1%-1%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%0%8%-1%0%51%8%28%72%-80%-96%-63%-125%8%19%42%92%-56%-80%-95%-61%-121%16%35%74%-100%72%-79%-94%-59%-117%24%51%106%-36%-56%-79%-93%-57%-113%32%67%-118%28%73%-78%-92%-55%-109%40%83%-86%92%-55%-78%-91%-53%-105%48%99%-54%-100%73%-77%-90%-51%-101%56%115%-22%-36%-55%-77%-89%-49%-97%64%-125%10%29%74%-76%-88%-47%-93%72%-109%42%93%-54%-76%-87%-45%-89%80%-93%74%-99%74%-75%-86%-43%-85%42%27%0%-40%-54%-75%-85%-41%-81%96%-61%-118%29%75%-74%-84%-39%-77%104%-63%46%72%64%1%107%73%11%5%-40%-70%37%9%87%-18%92%-111%117%-37%-34%13%-103%119%47%-33%-72%122%-3%122%-20%43%120%48%-32%-62%-122%-19%34%-34%72%120%-79%-58%-58%-114%49%66%-114%108%113%50%101%-118%-106%47%75%-52%-84%25%34%-25%-50%14%63%-125%102%40%122%-76%-62%-46%-90%17%-94%78%109%112%53%107%-126%-82%95%11%-116%45%-101%-10%107%-37%-84%113%-89%-42%109%-102%-9%104%-33%-96%-127%119%22%-82%-103%-8%101%-29%-108%-111%71%86%-18%-104%-7%98%-25%-120%-95%23%-106%46%-104%-70%95%-21%123%-79%-33%-43%62%-105%-69%91%-17%88%-63%95%-5%21%111%-107%124%85%-13%84%-47%79%85%47%-107%125%84%-9%80%-31%63%-107%-17%-108%126%83%-5%76%-15%47%-83%-5%-128%-126%-1%-1%20%76%0%-32%-128%4%22%104%-32%127%16%60%-96%-32%-126%10%30%-24%-32%-125%16%70%8%-95%-128%4%74%80%-64%3%9%100%-88%97%2%7%12%-80%-31%-121%32%-122%40%98%-122%8%4%32%-64%-119%40%10%16%0%2%35%-74%-24%-30%-117%48%-70%72%-128%1%33%58%-128%16%5%9%-128%-124%-29%65%-118%-3%-60%64%4%16%-19%-8%-111%-112%5%-11%-24%-45%-113%65%-26%56%-92%-110%69%6%-26%35%-112%15%17%-39%-111%-108%3%25%-39%19%-110%81%50%57%-91%-106%85%58%121%36%-108%14%81%-71%-111%-104%25%88%-55%19%-106%97%114%57%-90%-102%101%122%121%37%-104%13%85%32%64%-116%116%106%-120%-128%2%7%45%-64%98%-99%124%-10%25%35%1%19%68%84%-127%-124%-124%2%120%-63%65%24%20%-86%-24%-94%-123%86%32%-37%-93%-112%70%42%-23%-92%-108%86%106%-23%-91%-104%102%-86%-23%-90%-100%118%-22%-23%-89%-96%-122%42%-22%-88%-92%-106%106%-22%-87%-88%-90%-86%-22%-86%15%5%4%0%59%">
<eAnnotations xmi:id="_RufrIHBYEd2Nss_u28cvSA" source="image_papyrus">
@@ -7738,31 +7738,31 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_NRvQYBKTEdyXTt3sy29HXg" name="Env_Condition">
<ownedAttribute xmi:id="_Ou2uoBKTEdyXTt3sy29HXg" name="type" visibility="public" type="_Bgyx4BKTEdyXTt3sy29HXg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SoGREBKTEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sn8gEBKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SoGREBKTEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_SoGRERKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_O799kBKTEdyXTt3sy29HXg" name="status" visibility="public" type="_gvhewBKTEdyXTt3sy29HXg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UlGJQBKTEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uk8YQBKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UlGJQBKTEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UlPTMBKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_PBLNsBKTEdyXTt3sy29HXg" name="description" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WT7poBKTEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WTyfsBKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WT7poBKTEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_WUFaoBKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_PIL0oBKTEdyXTt3sy29HXg" name="range" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_6ekucBXWEdyC88-N-gXBsQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZA5mMBKTEdyXTt3sy29HXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZAmrQBKTEdyXTt3sy29HXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZA5mMBKTEdyXTt3sy29HXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ZA5mMRKTEdyXTt3sy29HXg">
<value xsi:nil="true"/>
</defaultValue>
@@ -7776,8 +7776,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_oxqoEGqqEdyHVMM3AaZxvA" name="Association_HwComponent_HwComponent" memberEnd="_oxuScGqqEdyHVMM3AaZxvA _ox-KEGqqEdyHVMM3AaZxvA">
<ownedEnd xmi:id="_ox-KEGqqEdyHVMM3AaZxvA" name="hwComponent" type="_ybY5ABKSEdyXTt3sy29HXg" isUnique="false" association="_oxqoEGqqEdyHVMM3AaZxvA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oyOowGqqEdyHVMM3AaZxvA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oyQd8GqqEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oyOowGqqEdyHVMM3AaZxvA" value="1"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -8256,24 +8256,24 @@
</eAnnotations>
<packagedElement xmi:type="uml:Association" xmi:id="_6oH_ABKUEdyxaob5agZuXg" name="Association_HwComponent_HwResourceService" memberEnd="_6oa58BKUEdyxaob5agZuXg _6peC0RKUEdyxaob5agZuXg">
<ownedEnd xmi:id="_6peC0RKUEdyxaob5agZuXg" name="hwComponent" type="_ybY5ABKSEdyXTt3sy29HXg" isUnique="false" association="_6oH_ABKUEdyxaob5agZuXg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6qNpsBKUEdyxaob5agZuXg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6qXasBKUEdyxaob5agZuXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6qNpsBKUEdyxaob5agZuXg" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WKaPUBKVEdyxaob5agZuXg" name="HwPowerSupply">
<generalization xmi:id="_l4vJYBKVEdyxaob5agZuXg" general="_ybY5ABKSEdyXTt3sy29HXg"/>
<ownedAttribute xmi:id="_dovpIBKVEdyxaob5agZuXg" name="suppliedPower" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fnLrwBKVEdyxaob5agZuXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fnCh0BKVEdyxaob5agZuXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fnLrwBKVEdyxaob5agZuXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_fnVcwBKVEdyxaob5agZuXg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_d0TY4BKVEdyxaob5agZuXg" name="capacity" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_QmcNwBFTEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iZ8uUBKVEdyxaob5agZuXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iZy9UBKVEdyxaob5agZuXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iZ8uUBKVEdyxaob5agZuXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_iaGfUBKVEdyxaob5agZuXg">
<value xsi:nil="true"/>
</defaultValue>
@@ -8288,8 +8288,8 @@
<generalization xmi:id="_lMH7ABKVEdyxaob5agZuXg" general="_ybY5ABKSEdyXTt3sy29HXg"/>
<ownedAttribute xmi:id="_ZeX6cBKVEdyxaob5agZuXg" name="coolingPower" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bttf0BKVEdyxaob5agZuXg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_btkV4BKVEdyxaob5agZuXg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bttf0BKVEdyxaob5agZuXg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bt3Q0BKVEdyxaob5agZuXg">
<value xsi:nil="true"/>
</defaultValue>
@@ -8628,48 +8628,48 @@
<generalization xmi:id="_SzrucBJxEdygQ5HMNSpiZw" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_OCw9IBJxEdygQ5HMNSpiZw" name="description" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q2aJcBJxEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q2QYcBJxEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q2aJcBJxEdygQ5HMNSpiZw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Q2aJcRJxEdygQ5HMNSpiZw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Wf6voBJxEdygQ5HMNSpiZw" name="p_HW_Services" type="_LTvyIBJxEdygQ5HMNSpiZw" aggregation="composite" association="_WcWeQBJxEdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WghMkRJxEdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WghMkBJxEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WghMkRJxEdygQ5HMNSpiZw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_XIl5MBJxEdygQ5HMNSpiZw" name="r_HW_Services" type="_LTvyIBJxEdygQ5HMNSpiZw" association="_XISXMBJxEdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XJLvEBJxEdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XJB-EBJxEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XJLvEBJxEdygQ5HMNSpiZw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_nbSroBJxEdygQ5HMNSpiZw" name="ownedHW" type="_LDER0BJxEdygQ5HMNSpiZw" aggregation="composite" association="_nbI6oBJxEdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ncCSgBJxEdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nb4hgBJxEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ncCSgBJxEdygQ5HMNSpiZw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_ntOGMBQ_EdyCa-N9ek5e_w" name="endPoints" type="_-ZhPABJ-EdyT_7R0WVpWAw" aggregation="composite" subsettedProperty="_nbSroBJxEdygQ5HMNSpiZw" association="_nsxaQBQ_EdyCa-N9ek5e_w">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dBciUGqqEdyHVMM3AaZxvA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dBZfAGqqEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dBciUGqqEdyHVMM3AaZxvA" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_p5sO4CCiEdyQTZkkq_UPhw" name="frequency" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_taJd4CCiEdyQTZkkq_UPhw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tZ93sCCiEdyQTZkkq_UPhw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_taJd4CCiEdyQTZkkq_UPhw" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_LTvyIBJxEdygQ5HMNSpiZw" name="HwResourceService">
<generalization xmi:id="_VkozIBJxEdygQ5HMNSpiZw" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_Mq-1wGqgEdyHVMM3AaZxvA" name="consumption" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WcS-0GqgEdyHVMM3AaZxvA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WcQikGqgEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WcS-0GqgEdyHVMM3AaZxvA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RFOzgGqgEdyHVMM3AaZxvA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_M-LekGqgEdyHVMM3AaZxvA" name="dissipation" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_nWsu8BFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V2m30GqgEdyHVMM3AaZxvA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V2j0gGqgEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V2m30GqgEdyHVMM3AaZxvA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UzktgGqgEdyHVMM3AaZxvA">
<value xsi:nil="true"/>
</defaultValue>
@@ -8677,20 +8677,20 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_WcWeQBJxEdygQ5HMNSpiZw" name="Association_HwResource_HwResourceService" memberEnd="_Wf6voBJxEdygQ5HMNSpiZw _Wgq9kBJxEdygQ5HMNSpiZw">
<ownedEnd xmi:id="_Wgq9kBJxEdygQ5HMNSpiZw" name="hwResource1" type="_LDER0BJxEdygQ5HMNSpiZw" isUnique="false" association="_WcWeQBJxEdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WhakcBJxEdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WhakcRJxEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WhakcBJxEdygQ5HMNSpiZw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_XISXMBJxEdygQ5HMNSpiZw" name="Association_HwResource_HwResourceService" memberEnd="_XIl5MBJxEdygQ5HMNSpiZw _XJLvERJxEdygQ5HMNSpiZw">
<ownedEnd xmi:id="_XJLvERJxEdygQ5HMNSpiZw" name="hwResource2" type="_LDER0BJxEdygQ5HMNSpiZw" isUnique="false" association="_XISXMBJxEdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XJ7V8BJxEdygQ5HMNSpiZw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XKFG8BJxEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XJ7V8BJxEdygQ5HMNSpiZw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_nbI6oBJxEdygQ5HMNSpiZw" name="Association_HwResource_HwResource" memberEnd="_nbSroBJxEdygQ5HMNSpiZw _ncCSgRJxEdygQ5HMNSpiZw">
<ownedEnd xmi:id="_ncCSgRJxEdygQ5HMNSpiZw" name="hwResource" type="_LDER0BJxEdygQ5HMNSpiZw" isUnique="false" association="_nbI6oBJxEdygQ5HMNSpiZw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ncx5YBJxEdygQ5HMNSpiZw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ncx5YRJxEdygQ5HMNSpiZw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ncx5YBJxEdygQ5HMNSpiZw" value="1"/>
</ownedEnd>
</packagedElement>
</packagedElement>
@@ -8729,22 +8729,22 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b9yKIrG3Ed-tmN4hwNCxXQ" name="SwResource" abstract="true" eSuperTypes="_b7sfcbG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b9yKI7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_b5kPgBJeEdy3Td9UhuLFPg"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKJLG3Ed-tmN4hwNCxXQ" name="identifierElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKJrG3Ed-tmN4hwNCxXQ" name="stateElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKKLG3Ed-tmN4hwNCxXQ" name="memorySizeFootprint" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKKrG3Ed-tmN4hwNCxXQ" name="createServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKLLG3Ed-tmN4hwNCxXQ" name="deleteServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKLrG3Ed-tmN4hwNCxXQ" name="initializeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b9yKQ7G3Ed-tmN4hwNCxXQ" name="MARTE_Library_BasicNFP_Types_NFP_Integer" instanceClassName="java.lang.String">
@@ -8761,7 +8761,7 @@
<eAnnotations xmi:id="_b9yKSLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_cMo8gBJeEdy3Td9UhuLFPg"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yKSbG3Ed-tmN4hwNCxXQ" name="isModifier" ordered="false" unique="false" eType="_e8J_wLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKS7G3Ed-tmN4hwNCxXQ" name="accessedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_e8AOwLG3Ed-tmN4hwNCxXQ" name="NFP_Integer" instanceClassName="java.lang.String">
@@ -8786,22 +8786,22 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3LcqAZi4Ed-m0Oaexd_lJA" name="SwResource" abstract="true" eSuperTypes="_0-x-Ipi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_3LcqApi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_b5kPgBJeEdy3Td9UhuLFPg"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3LcqA5i4Ed-m0Oaexd_lJA" name="identifierElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3LcqBZi4Ed-m0Oaexd_lJA" name="stateElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3LcqB5i4Ed-m0Oaexd_lJA" name="memorySizeFootprint" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3LcqCZi4Ed-m0Oaexd_lJA" name="createServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3LcqC5i4Ed-m0Oaexd_lJA" name="deleteServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3LcqDZi4Ed-m0Oaexd_lJA" name="initializeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_3Lcqepi4Ed-m0Oaexd_lJA" name="MARTE_Library_MARTE_DataTypes_VSL_Expression" instanceClassName="MARTE_Library_MARTE_DataTypes_VSL_Expression">
@@ -8858,7 +8858,7 @@
<eAnnotations xmi:id="_3LcqmJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_cMo8gBJeEdy3Td9UhuLFPg"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3LcqmZi4Ed-m0Oaexd_lJA" name="isModifier" ordered="false" unique="false" eType="_8lmlkJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3Lcqm5i4Ed-m0Oaexd_lJA" name="accessedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_8lmlkJi4Ed-m0Oaexd_lJA" name="Boolean" instanceClassName="java.lang.String">
@@ -8877,48 +8877,48 @@
<generalization xmi:id="_iSh8sBJeEdy3Td9UhuLFPg" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_j5CAcBJeEdy3Td9UhuLFPg" name="identifierElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6loUMBJeEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6lfKQBJeEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6loUMBJeEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_mzHL8BJeEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_j98VoBJeEdy3Td9UhuLFPg" name="stateElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7PyrgBJeEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7PphkBJeEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7PyrgBJeEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_tdgnYRJeEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_kBq_EBJeEdy3Td9UhuLFPg" name="memorySizeFootprint" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w-BgwBJeEdy3Td9UhuLFPg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w94W0BJeEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w-BgwBJeEdy3Td9UhuLFPg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_w-BgwRJeEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_kFZogBJeEdy3Td9UhuLFPg" name="createServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z1SBwBJeEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z1IQwBJeEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z1SBwBJeEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_z1SBwRJeEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_kJRb4BJeEdy3Td9UhuLFPg" name="deleteServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Q0QEBJeEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2QrGIBJeEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Q0QEBJeEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_2Q-BEBJeEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_kM2UUBJeEdy3Td9UhuLFPg" name="initializeServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45neUBJeEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45eUYBJeEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45neUBJeEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_45xPUBJeEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
@@ -8928,16 +8928,16 @@
<generalization xmi:id="_i1PoMBJeEdy3Td9UhuLFPg" general="_dDjlYBG5Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_B-PggBJfEdy3Td9UhuLFPg" name="isModifier" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ETs8ABJfEdy3Td9UhuLFPg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ETjyEBJfEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ETs8ABJfEdy3Td9UhuLFPg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ET2tABJfEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_CCaO0BJfEdy3Td9UhuLFPg" name="accessedElement" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HfaqEBJfEdy3Td9UhuLFPg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HfQ5EBJfEdy3Td9UhuLFPg" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HfaqEBJfEdy3Td9UhuLFPg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Hfj0ABJfEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
@@ -8966,7 +8966,7 @@
<eAnnotations xmi:id="_b9yKZrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_FWpxUBJgEdy3Td9UhuLFPg"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yKZ7G3Ed-tmN4hwNCxXQ" name="isReentrant" ordered="false" unique="false" eType="_e-F5cLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKabG3Ed-tmN4hwNCxXQ" name="routine" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b9yKdrG3Ed-tmN4hwNCxXQ" name="MARTE_MARTE_Foundations_Alloc_AllocationKind">
@@ -8996,52 +8996,52 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yKlLG3Ed-tmN4hwNCxXQ" name="type" ordered="false" unique="false" eType="_fD5mgLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yKlrG3Ed-tmN4hwNCxXQ" name="activationCapacity" ordered="false" unique="false" eType="_fEDXgLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKmLG3Ed-tmN4hwNCxXQ" name="entryPoints" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKmrG3Ed-tmN4hwNCxXQ" name="adressSpace" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKnLG3Ed-tmN4hwNCxXQ" name="periodElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKnrG3Ed-tmN4hwNCxXQ" name="priorityElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKoLG3Ed-tmN4hwNCxXQ" name="stackSizeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKorG3Ed-tmN4hwNCxXQ" name="activateServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKpLG3Ed-tmN4hwNCxXQ" name="enableConcurrencyServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKprG3Ed-tmN4hwNCxXQ" name="resumeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKqLG3Ed-tmN4hwNCxXQ" name="suspendServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKqrG3Ed-tmN4hwNCxXQ" name="terminateServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKrLG3Ed-tmN4hwNCxXQ" name="disableConcurrencyServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKrrG3Ed-tmN4hwNCxXQ" name="shareDataResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKsLG3Ed-tmN4hwNCxXQ" name="messageResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKsrG3Ed-tmN4hwNCxXQ" name="mutualExclusionResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKtLG3Ed-tmN4hwNCxXQ" name="notificationResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yKtrG3Ed-tmN4hwNCxXQ" name="heapSizeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b9yK2rG3Ed-tmN4hwNCxXQ" name="MARTE_Library_BasicNFP_Types_NFP_Integer" instanceClassName="java.lang.String">
@@ -9064,16 +9064,16 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yK4rG3Ed-tmN4hwNCxXQ" name="kind" ordered="false" unique="false" eType="_b9yKXrG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yK5LG3Ed-tmN4hwNCxXQ" name="isMaskable" ordered="false" unique="false" eType="_e-F5cLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK5rG3Ed-tmN4hwNCxXQ" name="vectorElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK6LG3Ed-tmN4hwNCxXQ" name="maskElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK6rG3Ed-tmN4hwNCxXQ" name="routineConnectServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK7LG3Ed-tmN4hwNCxXQ" name="routineDisconnectServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b9yK77G3Ed-tmN4hwNCxXQ" name="SwSchedulableResource" eSuperTypes="_b9yKkrG3Ed-tmN4hwNCxXQ _b7sf2LG3Ed-tmN4hwNCxXQ">
@@ -9081,25 +9081,25 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yK8bG3Ed-tmN4hwNCxXQ" name="isStaticSchedulingFeature" ordered="false" unique="false" eType="_e-F5cLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yK87G3Ed-tmN4hwNCxXQ" name="isPreemptable" ordered="false" unique="false" eType="_e-F5cLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK9bG3Ed-tmN4hwNCxXQ" name="schedulers" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK97G3Ed-tmN4hwNCxXQ" name="deadlineElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK-bG3Ed-tmN4hwNCxXQ" name="deadlineTypeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK-7G3Ed-tmN4hwNCxXQ" name="timeSliceElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK_bG3Ed-tmN4hwNCxXQ" name="delayServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yK_7G3Ed-tmN4hwNCxXQ" name="joinServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yLAbG3Ed-tmN4hwNCxXQ" name="yieldServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b9yLDrG3Ed-tmN4hwNCxXQ" name="MARTE_Library_GRM_BasicTypes_SchedParameters" instanceClassName="java.lang.String">
@@ -9150,7 +9150,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b9yLVrG3Ed-tmN4hwNCxXQ" name="SwTimerResource" eSuperTypes="_b7sgCbG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b9yLV7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hI6FYBJiEdypOJGS7WfJjQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yLWLG3Ed-tmN4hwNCxXQ" name="durationElements" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b9yLZbG3Ed-tmN4hwNCxXQ" name="MARTE_Library_BasicNFP_Types_NFP_Duration" instanceClassName="java.lang.String">
@@ -9161,26 +9161,26 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b9yLZ7G3Ed-tmN4hwNCxXQ" name="MemoryPartition" eSuperTypes="_b9yKIrG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b9yLaLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_M2YK4BJjEdypOJGS7WfJjQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yLabG3Ed-tmN4hwNCxXQ" name="concurrentResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yLa7G3Ed-tmN4hwNCxXQ" name="memorySpaces" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yLbbG3Ed-tmN4hwNCxXQ" name="fork" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yLb7G3Ed-tmN4hwNCxXQ" name="exit" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yLcbG3Ed-tmN4hwNCxXQ" name="base_Namespace" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Namespace"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b9yLdLG3Ed-tmN4hwNCxXQ" name="Alarm" eSuperTypes="_b9yK4LG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b9yLdbG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_QpmPoB2tEdym5pjrMPD5aQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b9yLdrG3Ed-tmN4hwNCxXQ" name="isWatchdog" ordered="false" unique="false" eType="_e-F5cLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b9yLeLG3Ed-tmN4hwNCxXQ" name="timers" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_e-F5cLG3Ed-tmN4hwNCxXQ" name="Boolean" instanceClassName="java.lang.String">
@@ -9234,7 +9234,7 @@
<eAnnotations xmi:id="_3WeOSZi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_FWpxUBJgEdy3Td9UhuLFPg"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3WeOSpi4Ed-m0Oaexd_lJA" name="isReentrant" ordered="false" unique="false" eType="_8oIVIJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOTJi4Ed-m0Oaexd_lJA" name="routine" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_3WeOWZi4Ed-m0Oaexd_lJA" name="MARTE_MARTE_Foundations_Alloc_AllocationKind">
@@ -9263,52 +9263,52 @@
<eAnnotations xmi:id="_3WeOdpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UwoMABJgEdy3Td9UhuLFPg"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3WeOeZi4Ed-m0Oaexd_lJA" name="activationCapacity" ordered="false" unique="false" eType="_8wLd4Ji4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOe5i4Ed-m0Oaexd_lJA" name="entryPoints" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOfZi4Ed-m0Oaexd_lJA" name="adressSpace" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOf5i4Ed-m0Oaexd_lJA" name="periodElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOgZi4Ed-m0Oaexd_lJA" name="priorityElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOg5i4Ed-m0Oaexd_lJA" name="stackSizeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOhZi4Ed-m0Oaexd_lJA" name="activateServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOh5i4Ed-m0Oaexd_lJA" name="enableConcurrencyServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOiZi4Ed-m0Oaexd_lJA" name="resumeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOi5i4Ed-m0Oaexd_lJA" name="suspendServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOjZi4Ed-m0Oaexd_lJA" name="terminateServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOj5i4Ed-m0Oaexd_lJA" name="disableConcurrencyServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOkZi4Ed-m0Oaexd_lJA" name="shareDataResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOk5i4Ed-m0Oaexd_lJA" name="messageResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOlZi4Ed-m0Oaexd_lJA" name="mutualExclusionResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOl5i4Ed-m0Oaexd_lJA" name="notificationResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeOmZi4Ed-m0Oaexd_lJA" name="heapSizeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_8ouyEJi4Ed-m0Oaexd_lJA" name="type" ordered="false" unique="false" eType="_8ouyEpi4Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -9389,16 +9389,16 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3WePppi4Ed-m0Oaexd_lJA" name="kind" ordered="false" unique="false" eType="_3WeOQZi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3WePqJi4Ed-m0Oaexd_lJA" name="isMaskable" ordered="false" unique="false" eType="_8oIVIJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePqpi4Ed-m0Oaexd_lJA" name="vectorElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePrJi4Ed-m0Oaexd_lJA" name="maskElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePrpi4Ed-m0Oaexd_lJA" name="routineConnectServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePsJi4Ed-m0Oaexd_lJA" name="routineDisconnectServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3WePs5i4Ed-m0Oaexd_lJA" name="SwSchedulableResource" eSuperTypes="_3WeOdZi4Ed-m0Oaexd_lJA _0-x--5i4Ed-m0Oaexd_lJA">
@@ -9406,25 +9406,25 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3WePtZi4Ed-m0Oaexd_lJA" name="isStaticSchedulingFeature" ordered="false" unique="false" eType="_8oIVIJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3WePt5i4Ed-m0Oaexd_lJA" name="isPreemptable" ordered="false" unique="false" eType="_8oIVIJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePuZi4Ed-m0Oaexd_lJA" name="schedulers" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePu5i4Ed-m0Oaexd_lJA" name="deadlineElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePvZi4Ed-m0Oaexd_lJA" name="deadlineTypeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePv5i4Ed-m0Oaexd_lJA" name="timeSliceElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePwZi4Ed-m0Oaexd_lJA" name="delayServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePw5i4Ed-m0Oaexd_lJA" name="joinServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WePxZi4Ed-m0Oaexd_lJA" name="yieldServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_3WeP-pi4Ed-m0Oaexd_lJA" name="MARTE_Library_GRM_BasicTypes_PeriodicServerKind">
@@ -9464,32 +9464,32 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3WeQQJi4Ed-m0Oaexd_lJA" name="SwTimerResource" eSuperTypes="_0-x_dpi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_3WeQQZi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hI6FYBJiEdypOJGS7WfJjQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeQQpi4Ed-m0Oaexd_lJA" name="durationElements" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3WeQT5i4Ed-m0Oaexd_lJA" name="MemoryPartition" eSuperTypes="_3LcqAZi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_3WeQUJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_M2YK4BJjEdypOJGS7WfJjQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeQUZi4Ed-m0Oaexd_lJA" name="concurrentResources" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeQU5i4Ed-m0Oaexd_lJA" name="memorySpaces" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeQVZi4Ed-m0Oaexd_lJA" name="fork" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeQV5i4Ed-m0Oaexd_lJA" name="exit" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeQWZi4Ed-m0Oaexd_lJA" name="base_Namespace" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Namespace"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3WeQXJi4Ed-m0Oaexd_lJA" name="Alarm" eSuperTypes="_3WePpJi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_3WeQXZi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_QpmPoB2tEdym5pjrMPD5aQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3WeQXpi4Ed-m0Oaexd_lJA" name="isWatchdog" ordered="false" unique="false" eType="_8oIVIJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3WeQYJi4Ed-m0Oaexd_lJA" name="timers" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_8oIVIJi4Ed-m0Oaexd_lJA" name="Boolean" instanceClassName="java.lang.String">
@@ -9537,16 +9537,16 @@
<generalization xmi:id="_WMfpcDLsEd2HYNz2hI9A2g" general="_kzoXABHbEdyWC5IKDhzksw"/>
<ownedAttribute xmi:id="_GaTmsBJgEdy3Td9UhuLFPg" name="isReentrant" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IsgS0BJgEdy3Td9UhuLFPg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IsXI4BJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IsgS0BJgEdy3Td9UhuLFPg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_IsgS0RJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Gl7n4BJgEdy3Td9UhuLFPg" name="routine" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LVz3YBJgEdy3Td9UhuLFPg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVqGYBJgEdy3Td9UhuLFPg" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LVz3YBJgEdy3Td9UhuLFPg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LV9BUBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
@@ -9556,144 +9556,144 @@
<generalization xmi:id="_UkKn4BJhEdy3Td9UhuLFPg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
<ownedAttribute xmi:id="_Y7GBUBJgEdy3Td9UhuLFPg" name="type" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_VDec8BFXEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cNPHgBJgEdy3Td9UhuLFPg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cNFWgBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cNPHgBJgEdy3Td9UhuLFPg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cNYRcBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Y-hv0BJgEdy3Td9UhuLFPg" name="activationCapacity" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fGoWgBJgEdy3Td9UhuLFPg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fGfMkBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fGoWgBJgEdy3Td9UhuLFPg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_fGyHgBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZB83QBJgEdy3Td9UhuLFPg" name="entryPoints" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h569gRJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h569gBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h569gRJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_h6EugBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZFhvsBJgEdy3Td9UhuLFPg" name="adressSpace" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rADbkBJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q_5qkBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rADbkBJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_rAMlgBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZJZjEBJgEdy3Td9UhuLFPg" name="periodElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tipUIBJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tigKMBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tipUIBJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_tizFIBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZM1RkBJgEdy3Td9UhuLFPg" name="priorityElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vyBVwBJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vx3kwBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vyBVwBJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_vyKfsBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZQQZABJgEdy3Td9UhuLFPg" name="stackSizeElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yfpZoBJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yffooBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yfpZoBJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_yfyjkBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZTPbkBJgEdy3Td9UhuLFPg" name="activateServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_19QwABJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_19G_ABJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_19QwABJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_19Z58BJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZXHO8BJgEdy3Td9UhuLFPg" name="enableConcurrencyServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_58tBEBJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_58jQEBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_58tBEBJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_582yEBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZaPbcBJgEdy3Td9UhuLFPg" name="resumeServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8PgKIBJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8PWZIBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8PgKIBJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8Pp7IBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZdOeABJgEdy3Td9UhuLFPg" name="suspendServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-0eoURJgEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-0eoUBJgEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-0eoURJgEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-0oZUBJgEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Zfw0oBJgEdy3Td9UhuLFPg" name="terminateServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CJTPEBJhEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CJKFIBJhEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CJTPEBJhEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_CJdAEBJhEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Zh_pQBJgEdy3Td9UhuLFPg" name="disableConcurrencyServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FD5X8BJhEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FDvm8BJhEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FD5X8BJhEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FEDI8BJhEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZkFT8BJgEdy3Td9UhuLFPg" name="shareDataResources" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hqg04BJhEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HqXq8BJhEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hqg04BJhEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Hqql4BJhEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Zo2fMBJgEdy3Td9UhuLFPg" name="messageResources" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KMELoBJhEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KL7BsBJhEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KMELoBJhEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_KMN8oBJhEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ZtK-gBJgEdy3Td9UhuLFPg" name="mutualExclusionResources" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NN0FYRJhEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NN0FYBJhEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NN0FYRJhEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NN92YBJhEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Z0xbUBJgEdy3Td9UhuLFPg" name="notificationResources" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PyzKoBJhEdy3Td9UhuLFPg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PypZoBJhEdy3Td9UhuLFPg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PyzKoBJhEdy3Td9UhuLFPg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_PyzKoRJhEdy3Td9UhuLFPg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_R3qMoDLrEd2HYNz2hI9A2g" name="heapSizeElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZOYikDLrEd2HYNz2hI9A2g" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZOFAkDLrEd2HYNz2hI9A2g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZOYikDLrEd2HYNz2hI9A2g" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ZOhsgDLrEd2HYNz2hI9A2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -9702,48 +9702,48 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_fO5sQBJhEdypOJGS7WfJjQ" name="InterruptResource">
<generalization xmi:id="_5zPtoBJhEdypOJGS7WfJjQ" general="_UwoMABJgEdy3Td9UhuLFPg"/>
<ownedAttribute xmi:id="_kziZgBJhEdypOJGS7WfJjQ" name="kind" visibility="public" type="_62OfgBJfEdy3Td9UhuLFPg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oZfzkBJhEdypOJGS7WfJjQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oZWpoBJhEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oZfzkBJhEdypOJGS7WfJjQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_oZpkkBJhEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_k46BsBJhEdypOJGS7WfJjQ" name="isMaskable" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rNY3gBJhEdypOJGS7WfJjQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rNPGgBJhEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rNY3gBJhEdypOJGS7WfJjQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_rNiBcBJhEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_k6sKYBJhEdypOJGS7WfJjQ" name="vectorElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uKEEABJhEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uJ66EBJhEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uKEEABJhEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_uKN1ABJhEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_lApocBJhEdypOJGS7WfJjQ" name="maskElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wg4xcBJhEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wgvngBJhEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wg4xcBJhEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_whCicBJhEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_lErM0BJhEdypOJGS7WfJjQ" name="routineConnectServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z0q2YBJhEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z0hFYBJhEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z0q2YBJhEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_z00nYBJhEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_lI2iMBJhEdypOJGS7WfJjQ" name="routineDisconnectServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_26lecBJhEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_26cUgBJhEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_26lecBJhEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_26vPcBJhEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -9764,72 +9764,72 @@
<generalization xmi:id="_lPtSwEFjEd6UW4qJC-Vahw" general="_1zYucBG0Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_7kzx4BJhEdypOJGS7WfJjQ" name="isStaticSchedulingFeature" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-73NQBJhEdypOJGS7WfJjQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-7uDUBJhEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-73NQBJhEdypOJGS7WfJjQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-73NQRJhEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_7npDcBJhEdypOJGS7WfJjQ" name="isPreemptable" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BmN6sBJiEdypOJGS7WfJjQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BmEJsBJiEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BmN6sBJiEdypOJGS7WfJjQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_BmXEoBJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_7qBpEBJhEdypOJGS7WfJjQ" name="schedulers" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EDTBIBJiEdypOJGS7WfJjQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EDJQIBJiEdypOJGS7WfJjQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EDTBIBJiEdypOJGS7WfJjQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_EDcyIBJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_7z26gBJhEdypOJGS7WfJjQ" name="deadlineElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4Xw0BJiEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G4Om4BJiEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4Xw0BJiEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_G4hh0BJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_72jCIBJhEdypOJGS7WfJjQ" name="deadlineTypeElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KlVx0BJiEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KlMn4BJiEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KlVx0BJiEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Klfi0BJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_75ExsBJhEdypOJGS7WfJjQ" name="timeSliceElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NUm0cBJiEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NUdqgBJiEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NUm0cBJiEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NUwlcBJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_79QHEBJhEdypOJGS7WfJjQ" name="delayServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qg8NkBJiEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QgyckBJiEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qg8NkBJiEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_QhFXgBJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_7_ossBJhEdypOJGS7WfJjQ" name="joinServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TG0DoBJiEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TGq5sBJiEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TG0DoBJiEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TG90oBJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8CKcQBJhEdypOJGS7WfJjQ" name="yieldServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VqdFEBJiEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VqT7IBJiEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VqdFEBJiEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Vqm2EBJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -9849,8 +9849,8 @@
<generalization xmi:id="_xm5h0BJiEdypOJGS7WfJjQ" general="_7IF3YBG2Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_i3DCMBJiEdypOJGS7WfJjQ" name="durationElements" visibility="public" isUnique="false" redefinedProperty="_9OzFMBG2Edyb1KzJ7GkiGA">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sjfSUBJiEdypOJGS7WfJjQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sjVhUBJiEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sjfSUBJiEdypOJGS7WfJjQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sjocQBJiEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -9860,32 +9860,32 @@
<generalization xmi:id="_bnRzYBJjEdypOJGS7WfJjQ" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
<ownedAttribute xmi:id="_OUlOQBJjEdypOJGS7WfJjQ" name="concurrentResources" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q7rMUBJjEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q7hbUBJjEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q7rMUBJjEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Q70WQBJjEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OYk9cBJjEdypOJGS7WfJjQ" name="memorySpaces" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T3pOMBJjEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T3gEQBJjEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T3pOMBJjEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_T3y_MBJjEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OcInwBJjEdypOJGS7WfJjQ" name="fork" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WF2LIBJjEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WFtBMBJjEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WF2LIBJjEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_WF_8IBJjEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Of2DEBJjEdypOJGS7WfJjQ" name="exit" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y3TmIBJjEdypOJGS7WfJjQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y3J1IBJjEdypOJGS7WfJjQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y3TmIBJjEdypOJGS7WfJjQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Y3cwEBJjEdypOJGS7WfJjQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -9911,16 +9911,16 @@
<generalization xmi:id="_YhsNQB2tEdym5pjrMPD5aQ" general="_fO5sQBJhEdypOJGS7WfJjQ"/>
<ownedAttribute xmi:id="_Rb9gsB2tEdym5pjrMPD5aQ" name="isWatchdog" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TKhUQB2tEdym5pjrMPD5aQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TKYKUB2tEdym5pjrMPD5aQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TKhUQB2tEdym5pjrMPD5aQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TKrFQB2tEdym5pjrMPD5aQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_UnDjsB2tEdym5pjrMPD5aQ" name="timers" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XNgBgB2tEdym5pjrMPD5aQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XNWQgB2tEdym5pjrMPD5aQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XNgBgB2tEdym5pjrMPD5aQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_XNgBgR2tEdym5pjrMPD5aQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -9960,22 +9960,22 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b977K7G3Ed-tmN4hwNCxXQ" name="accessPolicy" ordered="false" unique="false" eType="_b977IrG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b977LbG3Ed-tmN4hwNCxXQ" name="isBuffered" ordered="false" unique="false" eType="_fWE7oLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977L7G3Ed-tmN4hwNCxXQ" name="devices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977MbG3Ed-tmN4hwNCxXQ" name="closeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977M7G3Ed-tmN4hwNCxXQ" name="controlServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977NbG3Ed-tmN4hwNCxXQ" name="openServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977N7G3Ed-tmN4hwNCxXQ" name="readServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977ObG3Ed-tmN4hwNCxXQ" name="writeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b977XbG3Ed-tmN4hwNCxXQ" name="MARTE_Library_BasicNFP_Types_NFP_Integer" instanceClassName="java.lang.String">
@@ -9992,25 +9992,25 @@
<eAnnotations xmi:id="_b977YrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ovMq4BJuEdyNBsnA2HLmgg"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b977Y7G3Ed-tmN4hwNCxXQ" name="accessPolicy" ordered="false" unique="false" eType="_b977IrG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977ZbG3Ed-tmN4hwNCxXQ" name="memories" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977Z7G3Ed-tmN4hwNCxXQ" name="memoryBlockAdressElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977abG3Ed-tmN4hwNCxXQ" name="memoryBlockSizeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977a7G3Ed-tmN4hwNCxXQ" name="lockServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977bbG3Ed-tmN4hwNCxXQ" name="unlockServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977b7G3Ed-tmN4hwNCxXQ" name="mapServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977cbG3Ed-tmN4hwNCxXQ" name="unMapServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_fV7KoLG3Ed-tmN4hwNCxXQ" name="NFP_Integer" instanceClassName="java.lang.String">
@@ -10045,22 +10045,22 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3dn_K5i4Ed-m0Oaexd_lJA" name="accessPolicy" ordered="false" unique="false" eType="_3dn_Ipi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3dn_LZi4Ed-m0Oaexd_lJA" name="isBuffered" ordered="false" unique="false" eType="_9HH-QJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_L5i4Ed-m0Oaexd_lJA" name="devices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_MZi4Ed-m0Oaexd_lJA" name="closeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_M5i4Ed-m0Oaexd_lJA" name="controlServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_NZi4Ed-m0Oaexd_lJA" name="openServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_N5i4Ed-m0Oaexd_lJA" name="readServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_OZi4Ed-m0Oaexd_lJA" name="writeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_3dn_tZi4Ed-m0Oaexd_lJA" name="MARTE_Library_MARTE_DataTypes_VSL_Expression" instanceClassName="MARTE_Library_MARTE_DataTypes_VSL_Expression">
@@ -10117,25 +10117,25 @@
<eAnnotations xmi:id="_3dn_05i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ovMq4BJuEdyNBsnA2HLmgg"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3dn_1Ji4Ed-m0Oaexd_lJA" name="accessPolicy" ordered="false" unique="false" eType="_3dn_Ipi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_1pi4Ed-m0Oaexd_lJA" name="memories" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_2Ji4Ed-m0Oaexd_lJA" name="memoryBlockAdressElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_2pi4Ed-m0Oaexd_lJA" name="memoryBlockSizeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_3Ji4Ed-m0Oaexd_lJA" name="lockServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_3pi4Ed-m0Oaexd_lJA" name="unlockServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_4Ji4Ed-m0Oaexd_lJA" name="mapServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3dn_4pi4Ed-m0Oaexd_lJA" name="unMapServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_9HH-QJi4Ed-m0Oaexd_lJA" name="Boolean" instanceClassName="java.lang.String">
@@ -10161,64 +10161,64 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_IXI-cBJuEdyNBsnA2HLmgg" name="DeviceBroker">
<generalization xmi:id="_mXGLEBJuEdyNBsnA2HLmgg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
<ownedAttribute xmi:id="_LCTkMBJuEdyNBsnA2HLmgg" name="accessPolicy" visibility="public" type="_iJA2gBJtEdyNBsnA2HLmgg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_DpMBJuEdyNBsnA2HLmgg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N-54MBJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_DpMBJuEdyNBsnA2HLmgg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_N_MzIBJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_LFuroBJuEdyNBsnA2HLmgg" name="isBuffered" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q7XCQBJuEdyNBsnA2HLmgg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q7NRQBJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q7XCQBJuEdyNBsnA2HLmgg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Q7gMMBJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_LI24IBJuEdyNBsnA2HLmgg" name="devices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V-CR8BJuEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V94g8BJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V-CR8BJuEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_V-Lb4BJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_LMbwkBJuEdyNBsnA2HLmgg" name="closeServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y-9FQBJuEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y-zUQBJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y-9FQBJuEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Y_GPMBJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_LSZOoBJuEdyNBsnA2HLmgg" name="controlServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cUuuQBJuEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cUk9QBJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cUuuQBJuEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cU34MBJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_LV-HEBJuEdyNBsnA2HLmgg" name="openServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fHV_0BJuEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fHMO0BJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fHV_0BJuEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_fHfw0BJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_LZ_rcBJuEdyNBsnA2HLmgg" name="readServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_huV3QBJuEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_huMGQBJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_huV3QBJuEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_huV3QRJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Ld3e0BJuEdyNBsnA2HLmgg" name="writeServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kVCzwBJuEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kU5CwBJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kVCzwBJuEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kVL9sBJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
@@ -10237,64 +10237,64 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_ovMq4BJuEdyNBsnA2HLmgg" name="MemoryBroker">
<generalization xmi:id="_QDqIwBJvEdyNBsnA2HLmgg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
<ownedAttribute xmi:id="_qC68kBJuEdyNBsnA2HLmgg" name="accessPolicy" visibility="public" type="_iJA2gBJtEdyNBsnA2HLmgg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t8J38BJuEdyNBsnA2HLmgg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t8AG8BJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t8J38BJuEdyNBsnA2HLmgg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_t8To8BJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_qGyv8BJuEdyNBsnA2HLmgg" name="memories" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wWfzcBJuEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wWWCcBJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wWfzcBJuEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_wWfzcRJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_q-DvIBJuEdyNBsnA2HLmgg" name="memoryBlockAdressElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2z57wBJuEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2zwx0BJuEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2z57wBJuEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_20DswBJuEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_rCYOcBJuEdyNBsnA2HLmgg" name="memoryBlockSizeElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ERUjIBJvEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ERKyIBJvEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ERUjIBJvEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_EReUIBJvEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_rHTKsBJuEdyNBsnA2HLmgg" name="lockServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GyXjkBJvEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GyOZoBJvEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GyXjkBJvEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GyqegBJvEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_rLd5ABJuEdyNBsnA2HLmgg" name="unlockServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JUwn0BJvEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JUm20BJvEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JUwn0BJvEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_JU6Y0BJvEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_rPfdYBJuEdyNBsnA2HLmgg" name="mapServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Lg0PsBJvEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LgrFwBJvEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Lg0PsBJvEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Lg-AsBJvEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_rTNfwBJuEdyNBsnA2HLmgg" name="unMapServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NgiEsBJvEdyNBsnA2HLmgg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NgYTsBJvEdyNBsnA2HLmgg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NgiEsBJvEdyNBsnA2HLmgg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NgrOoBJvEdyNBsnA2HLmgg">
<value xsi:nil="true"/>
</defaultValue>
@@ -10376,7 +10376,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b977o7G3Ed-tmN4hwNCxXQ" name="waitingQueuePolicy" ordered="false" unique="false" eType="_b977drG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b977pbG3Ed-tmN4hwNCxXQ" name="waitingQueueCapacity" ordered="false" unique="false" eType="_fbb8wLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b977p7G3Ed-tmN4hwNCxXQ" name="waitingPolicyElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b977y7G3Ed-tmN4hwNCxXQ" name="MARTE_Library_BasicNFP_Types_NFP_Integer" instanceClassName="java.lang.String">
@@ -10466,10 +10466,10 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b978RbG3Ed-tmN4hwNCxXQ" name="SharedDataComResource" eSuperTypes="_b9770bG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b978RrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_kwKJ0BJrEdyJdskagPjJSA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978R7G3Ed-tmN4hwNCxXQ" name="readServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978SbG3Ed-tmN4hwNCxXQ" name="writeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b978TLG3Ed-tmN4hwNCxXQ" name="MessageComResource" eSuperTypes="_b9770bG3Ed-tmN4hwNCxXQ">
@@ -10477,17 +10477,17 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b978TrG3Ed-tmN4hwNCxXQ" name="isFixedMessageSize" ordered="false" unique="false" eType="_fa1f0LG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b978ULG3Ed-tmN4hwNCxXQ" name="mechanism" ordered="false" unique="false" eType="_b977fbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978UrG3Ed-tmN4hwNCxXQ" name="messageSizeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978VLG3Ed-tmN4hwNCxXQ" name="messageQueueCapacityElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b978VrG3Ed-tmN4hwNCxXQ" name="messageQueuePolicy" ordered="false" unique="false" eType="_b977drG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978WLG3Ed-tmN4hwNCxXQ" name="sendServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978WrG3Ed-tmN4hwNCxXQ" name="receiveServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b978XbG3Ed-tmN4hwNCxXQ" name="NotificationResource" eSuperTypes="_b978PrG3Ed-tmN4hwNCxXQ">
@@ -10495,22 +10495,22 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b978X7G3Ed-tmN4hwNCxXQ" name="occurence" ordered="false" unique="false" eType="_b977hLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b978YbG3Ed-tmN4hwNCxXQ" name="mechanism" ordered="false" unique="false" eType="_b977i7G3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978Y7G3Ed-tmN4hwNCxXQ" name="occurenceCountElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978ZbG3Ed-tmN4hwNCxXQ" name="maskElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978Z7G3Ed-tmN4hwNCxXQ" name="flushServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978abG3Ed-tmN4hwNCxXQ" name="signalServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978a7G3Ed-tmN4hwNCxXQ" name="waitServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978bbG3Ed-tmN4hwNCxXQ" name="clearServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b978cLG3Ed-tmN4hwNCxXQ" name="SwMutualExclusionResource" eSuperTypes="_b978PrG3Ed-tmN4hwNCxXQ _b7sfxLG3Ed-tmN4hwNCxXQ">
@@ -10518,13 +10518,13 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b978crG3Ed-tmN4hwNCxXQ" name="mechanism" ordered="false" unique="false" eType="_b977kbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b978dLG3Ed-tmN4hwNCxXQ" name="concurrentAccessProtocol" ordered="false" unique="false" eType="_b977mLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978drG3Ed-tmN4hwNCxXQ" name="accessTokenElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978eLG3Ed-tmN4hwNCxXQ" name="releaseServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b978erG3Ed-tmN4hwNCxXQ" name="acquireServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_fasV4LG3Ed-tmN4hwNCxXQ" name="NFP_Integer" instanceClassName="java.lang.String">
@@ -10626,7 +10626,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqKn5i4Ed-m0Oaexd_lJA" name="waitingQueuePolicy" ordered="false" unique="false" eType="_3oqKcpi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqKoZi4Ed-m0Oaexd_lJA" name="waitingQueueCapacity" ordered="false" unique="false" eType="_9OIlMJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqKo5i4Ed-m0Oaexd_lJA" name="waitingPolicyElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_3oqLH5i4Ed-m0Oaexd_lJA" name="MARTE_Library_MARTE_DataTypes_VSL_Expression" instanceClassName="MARTE_Library_MARTE_DataTypes_VSL_Expression">
@@ -10755,10 +10755,10 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3oqL-5i4Ed-m0Oaexd_lJA" name="SharedDataComResource" eSuperTypes="_3oqLPJi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_3oqL_Ji4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_kwKJ0BJrEdyJdskagPjJSA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqL_Zi4Ed-m0Oaexd_lJA" name="readServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqL_5i4Ed-m0Oaexd_lJA" name="writeServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3oqMApi4Ed-m0Oaexd_lJA" name="MessageComResource" eSuperTypes="_3oqLPJi4Ed-m0Oaexd_lJA">
@@ -10766,17 +10766,17 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqMBJi4Ed-m0Oaexd_lJA" name="isFixedMessageSize" ordered="false" unique="false" eType="_9NPNUJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqMBpi4Ed-m0Oaexd_lJA" name="mechanism" ordered="false" unique="false" eType="_3oqKeZi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMCJi4Ed-m0Oaexd_lJA" name="messageSizeElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMCpi4Ed-m0Oaexd_lJA" name="messageQueueCapacityElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqMDJi4Ed-m0Oaexd_lJA" name="messageQueuePolicy" ordered="false" unique="false" eType="_3oqKcpi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMDpi4Ed-m0Oaexd_lJA" name="sendServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMEJi4Ed-m0Oaexd_lJA" name="receiveServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3oqME5i4Ed-m0Oaexd_lJA" name="NotificationResource" eSuperTypes="_3oqL9Ji4Ed-m0Oaexd_lJA">
@@ -10784,22 +10784,22 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqMFZi4Ed-m0Oaexd_lJA" name="occurence" ordered="false" unique="false" eType="_3oqKgJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqMF5i4Ed-m0Oaexd_lJA" name="mechanism" ordered="false" unique="false" eType="_3oqKh5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMGZi4Ed-m0Oaexd_lJA" name="occurenceCountElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMG5i4Ed-m0Oaexd_lJA" name="maskElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMHZi4Ed-m0Oaexd_lJA" name="flushServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMH5i4Ed-m0Oaexd_lJA" name="signalServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMIZi4Ed-m0Oaexd_lJA" name="waitServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMI5i4Ed-m0Oaexd_lJA" name="clearServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3oqMJpi4Ed-m0Oaexd_lJA" name="SwMutualExclusionResource" eSuperTypes="_3oqL9Ji4Ed-m0Oaexd_lJA _0-x-55i4Ed-m0Oaexd_lJA">
@@ -10807,13 +10807,13 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqMKJi4Ed-m0Oaexd_lJA" name="mechanism" ordered="false" unique="false" eType="_3oqKjZi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3oqMKpi4Ed-m0Oaexd_lJA" name="concurrentAccessProtocol" ordered="false" unique="false" eType="_3oqKlJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMLJi4Ed-m0Oaexd_lJA" name="accessTokenElements" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TypedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMLpi4Ed-m0Oaexd_lJA" name="releaseServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3oqMMJi4Ed-m0Oaexd_lJA" name="acquireServices" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_9NPNUJi4Ed-m0Oaexd_lJA" name="Boolean" instanceClassName="java.lang.String">
@@ -10899,31 +10899,31 @@
<generalization xmi:id="_1QPi4BJpEdy4mPo_dcOmkg" general="_b5kPgBJeEdy3Td9UhuLFPg"/>
<ownedAttribute xmi:id="_lk2BABJpEdy4mPo_dcOmkg" name="isIntraMemoryPartitionInteraction" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pedW4BJpEdy4mPo_dcOmkg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_peUM8BJpEdy4mPo_dcOmkg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pedW4BJpEdy4mPo_dcOmkg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_penH4BJpEdy4mPo_dcOmkg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_lq9QEBJpEdy4mPo_dcOmkg" name="waitingQueuePolicy" visibility="public" type="_qdRlABJoEdy4mPo_dcOmkg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sa554BJpEdy4mPo_dcOmkg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sawv8BJpEdy4mPo_dcOmkg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sa554BJpEdy4mPo_dcOmkg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sa554RJpEdy4mPo_dcOmkg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_lvcHcBJpEdy4mPo_dcOmkg" name="waitingQueueCapacity" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_HJ1zcAnfEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vz2LoBJpEdy4mPo_dcOmkg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vztBsBJpEdy4mPo_dcOmkg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vz2LoBJpEdy4mPo_dcOmkg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_vz_8oBJpEdy4mPo_dcOmkg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_l0EIwBJpEdy4mPo_dcOmkg" name="waitingPolicyElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y0n1ABJpEdy4mPo_dcOmkg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y0eEABJpEdy4mPo_dcOmkg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y0n1ABJpEdy4mPo_dcOmkg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_y0xmABJpEdy4mPo_dcOmkg">
<value xsi:nil="true"/>
</defaultValue>
@@ -10941,16 +10941,16 @@
<generalization xmi:id="_JpclwBJsEdyJdskagPjJSA" general="_34ZQ4BJpEdy4mPo_dcOmkg"/>
<ownedAttribute xmi:id="_opaTUBJrEdyJdskagPjJSA" name="readServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q-sIoBJrEdyJdskagPjJSA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q-i-sBJrEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q-sIoBJrEdyJdskagPjJSA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_q-15oBJrEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_otuyoBJrEdyJdskagPjJSA" name="writeServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uKzfUBJrEdyJdskagPjJSA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uKpuUBJrEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uKzfUBJrEdyJdskagPjJSA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_uK9QUBJrEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
@@ -10970,54 +10970,54 @@
<generalization xmi:id="_KXxrYBJsEdyJdskagPjJSA" general="_34ZQ4BJpEdy4mPo_dcOmkg"/>
<ownedAttribute xmi:id="_wsA30BJrEdyJdskagPjJSA" name="isFixedMessageSize" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zUqVEBJrEdyJdskagPjJSA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zUgkEBJrEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zUqVEBJrEdyJdskagPjJSA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_zU9QABJrEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_wwehEBJrEdyJdskagPjJSA" name="mechanism" visibility="public" type="_xPJhcBJoEdy4mPo_dcOmkg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1_jOABJrEdyJdskagPjJSA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1_ZdABJrEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1_jOABJrEdyJdskagPjJSA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_1_s_ABJrEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_w0gFcBJrEdyJdskagPjJSA" name="messageSizeElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5lvRkBJrEdyJdskagPjJSA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5llgkBJrEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5lvRkBJrEdyJdskagPjJSA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5lvRkRJrEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_w4Ou4BJrEdyJdskagPjJSA" name="messageQueueCapacityElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_83D4YBJrEdyJdskagPjJSA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_826HYBJrEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_83D4YBJrEdyJdskagPjJSA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_83NpYBJrEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_w8PsMBJrEdyJdskagPjJSA" name="messageQueuePolicy" visibility="public" type="_qdRlABJoEdy4mPo_dcOmkg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A5jdcBJsEdyJdskagPjJSA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A5ZscBJsEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A5jdcBJsEdyJdskagPjJSA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_A5tOcBJsEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_xBnUYBJrEdyJdskagPjJSA" name="sendServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DYEuUBJsEdyJdskagPjJSA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DX7kYBJsEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DYEuUBJsEdyJdskagPjJSA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_DYOfUBJsEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_xFyCsBJrEdyJdskagPjJSA" name="receiveServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GJOAQBJsEdyJdskagPjJSA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GJE2UBJsEdyJdskagPjJSA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GJOAQBJsEdyJdskagPjJSA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GJXxQBJsEdyJdskagPjJSA">
<value xsi:nil="true"/>
</defaultValue>
@@ -11036,63 +11036,63 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Z1NCsBJsEdyz67WHCXYdRQ" name="NotificationResource">
<generalization xmi:id="_050fkBJsEdyz67WHCXYdRQ" general="_82VxkBJpEdy4mPo_dcOmkg"/>
<ownedAttribute xmi:id="_bjnFQBJsEdyz67WHCXYdRQ" name="occurence" visibility="public" type="_5CilQBJoEdy4mPo_dcOmkg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d3Zs0BJsEdyz67WHCXYdRQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_d3Qi4BJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d3Zs0BJsEdyz67WHCXYdRQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_d3jd0BJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_boOfgBJsEdyz67WHCXYdRQ" name="mechanism" visibility="public" type="_AJDU8BJpEdy4mPo_dcOmkg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hanU4BJsEdyz67WHCXYdRQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hadj4BJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hanU4BJsEdyz67WHCXYdRQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_hanU4RJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_bsZN0BJsEdyz67WHCXYdRQ" name="occurenceCountElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kaNSgBJsEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kaEIkBJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kaNSgBJsEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kaNSgRJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_bwayMBJsEdyz67WHCXYdRQ" name="maskElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mm-sERJsEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mm-sEBJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mm-sERJsEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_mnIdEBJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_b0vRgBJsEdyz67WHCXYdRQ" name="flushServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_o_e0gBJsEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_o_VDgBJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_o_e0gBJsEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_o_e0gRJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_b46m4BJsEdyz67WHCXYdRQ" name="signalServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rMNx0BJsEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rMEA0BJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rMNx0BJsEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_rMNx0RJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_b9FVMBJsEdyz67WHCXYdRQ" name="waitServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t1_QcBJsEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t11fcBJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t1_QcBJsEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_t2IaYBJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_cBG5kBJsEdyz67WHCXYdRQ" name="clearServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v3spgBJsEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_v3jfkBJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v3spgBJsEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_v32agBJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -11112,39 +11112,39 @@
<generalization xmi:id="_7Exl8BJsEdyz67WHCXYdRQ" general="_82VxkBJpEdy4mPo_dcOmkg"/>
<generalization xmi:id="_uDRicEIZEd6dmI2dd6jVFQ" general="_y3mvQBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_7rV2sBJsEdyz67WHCXYdRQ" name="mechanism" visibility="public" type="_H1teoBJpEdy4mPo_dcOmkg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-v7CABJsEdyz67WHCXYdRQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-vx4EBJsEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-v7CABJsEdyz67WHCXYdRQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-v7CARJsEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_7u6vIBJsEdyz67WHCXYdRQ" name="concurrentAccessProtocol" visibility="public" type="_PhoBcBJpEdy4mPo_dcOmkg" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CaLtQBJtEdyz67WHCXYdRQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CaB8QBJtEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CaLtQBJtEdyz67WHCXYdRQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_CaVeQBJtEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_79Np0BJsEdyz67WHCXYdRQ" name="accessTokenElements" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TypedElement"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FdH50BJtEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Fc-v4BJtEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FdH50BJtEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FdRq0BJtEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8EXasBJsEdyz67WHCXYdRQ" name="releaseServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_II_DIBJtEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_II1SIBJtEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_II_DIBJtEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_IJI0IBJtEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8HfnMBJsEdyz67WHCXYdRQ" name="acquireServices" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LELo8BJtEdyz67WHCXYdRQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LECfABJtEdyz67WHCXYdRQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LELo8BJtEdyz67WHCXYdRQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LEVZ8BJtEdyz67WHCXYdRQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -11176,7 +11176,7 @@
<eAnnotations xmi:id="_b-FFE7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lMax0BHYEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-FFFLG3Ed-tmN4hwNCxXQ" name="direction" ordered="false" unique="false" lowerBound="1" eType="_b-FFGLG3Ed-tmN4hwNCxXQ" defaultValueLiteral="inout"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFFrG3Ed-tmN4hwNCxXQ" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b-FFGLG3Ed-tmN4hwNCxXQ" name="FlowDirectionKind">
@@ -11190,7 +11190,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-FFH7G3Ed-tmN4hwNCxXQ" name="isAtomic" ordered="false" unique="false" lowerBound="1" eType="_fvjLkLG3Ed-tmN4hwNCxXQ" volatile="true" transient="true" derived="true"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-FFIbG3Ed-tmN4hwNCxXQ" name="direction" ordered="false" unique="false" lowerBound="1" eType="_b-FFGLG3Ed-tmN4hwNCxXQ" defaultValueLiteral="inout"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFI7G3Ed-tmN4hwNCxXQ" name="base_Port" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b-FFJbG3Ed-tmN4hwNCxXQ" name="MARTE_Library_MARTE_PrimitivesTypes_Boolean" instanceClassName="boolean">
@@ -11201,15 +11201,15 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFJ7G3Ed-tmN4hwNCxXQ" name="ClientServerPort">
<eAnnotations xmi:id="_b-FFKLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xgP68BHYEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFKbG3Ed-tmN4hwNCxXQ" name="base_Port" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-FFK7G3Ed-tmN4hwNCxXQ" name="specificationKind" ordered="false" unique="false" lowerBound="1" eType="_b-FFNbG3Ed-tmN4hwNCxXQ" volatile="true" transient="true" defaultValueLiteral="interfaceBased" derived="true"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-FFLbG3Ed-tmN4hwNCxXQ" name="kind" ordered="false" unique="false" lowerBound="1" eType="_b-FFOrG3Ed-tmN4hwNCxXQ" defaultValueLiteral="proreq"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFL7G3Ed-tmN4hwNCxXQ" name="provInterface" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFMbG3Ed-tmN4hwNCxXQ" name="reqInterface" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFM7G3Ed-tmN4hwNCxXQ" name="featuresSpec" ordered="false" unique="false" eType="_b-FFP7G3Ed-tmN4hwNCxXQ"/>
</eClassifiers>
@@ -11228,60 +11228,60 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFP7G3Ed-tmN4hwNCxXQ" name="ClientServerSpecification">
<eAnnotations xmi:id="_b-FFQLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lOsNQBHZEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFQbG3Ed-tmN4hwNCxXQ" name="base_Interface" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFQ7G3Ed-tmN4hwNCxXQ" name="FlowSpecification">
<eAnnotations xmi:id="_b-FFRLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_bH1SABHZEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFRbG3Ed-tmN4hwNCxXQ" name="base_Interface" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFR7G3Ed-tmN4hwNCxXQ" name="ClientServerFeature">
<eAnnotations xmi:id="_b-FFSLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_cC1EMBRWEdyCa-N9ek5e_w"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-FFSbG3Ed-tmN4hwNCxXQ" name="kind" ordered="false" unique="false" lowerBound="1" eType="_b-FFOrG3Ed-tmN4hwNCxXQ" defaultValueLiteral="proreq"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFS7G3Ed-tmN4hwNCxXQ" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFTbG3Ed-tmN4hwNCxXQ" name="GCMTrigger">
<eAnnotations xmi:id="_b-FFTrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_T6i0MEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFT7G3Ed-tmN4hwNCxXQ" name="base_Trigger" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Trigger"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Trigger"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFUbG3Ed-tmN4hwNCxXQ" name="feature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Feature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFU7G3Ed-tmN4hwNCxXQ" name="GCMInvocationAction">
<eAnnotations xmi:id="_b-FFVLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vj4wkEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFVbG3Ed-tmN4hwNCxXQ" name="base_InvocationAction" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFV7G3Ed-tmN4hwNCxXQ" name="onFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Feature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFWbG3Ed-tmN4hwNCxXQ" name="DataEvent">
<eAnnotations xmi:id="_b-FFWrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aXqBkEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFW7G3Ed-tmN4hwNCxXQ" name="base_AnyReceiveEvent" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//AnyReceiveEvent"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//AnyReceiveEvent"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFXbG3Ed-tmN4hwNCxXQ" name="classifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Classifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFX7G3Ed-tmN4hwNCxXQ" name="DataPool">
<eAnnotations xmi:id="_b-FFYLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ewP9AEFYEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-FFYbG3Ed-tmN4hwNCxXQ" name="ordering" ordered="false" unique="false" lowerBound="1" eType="_b-FFabG3Ed-tmN4hwNCxXQ" defaultValueLiteral="FIFO"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFY7G3Ed-tmN4hwNCxXQ" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFZbG3Ed-tmN4hwNCxXQ" name="insertion" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFZ7G3Ed-tmN4hwNCxXQ" name="selection" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b-FFabG3Ed-tmN4hwNCxXQ" name="DataPoolOrderingKind">
@@ -11293,16 +11293,16 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-FFbrG3Ed-tmN4hwNCxXQ" name="GCMInvocatingBehavior">
<eAnnotations xmi:id="_b-FFb7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_MltCULG2Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFcLG3Ed-tmN4hwNCxXQ" name="base_Behavior" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFcrG3Ed-tmN4hwNCxXQ" name="onPorts" ordered="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFdLG3Ed-tmN4hwNCxXQ" name="onFeatures" ordered="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Feature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-FFdrG3Ed-tmN4hwNCxXQ" name="invocations" ordered="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_fvjLkLG3Ed-tmN4hwNCxXQ" name="Boolean" instanceClassName="java.lang.String">
@@ -11323,7 +11323,7 @@
<eAnnotations xmi:id="_6OK047G2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lMax0BHYEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6OK05LG2Ed-tmN4hwNCxXQ" name="direction" ordered="false" unique="false" lowerBound="1" eType="_6OK06LG2Ed-tmN4hwNCxXQ" defaultValueLiteral="inout"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK05rG2Ed-tmN4hwNCxXQ" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_6OK06LG2Ed-tmN4hwNCxXQ" name="FlowDirectionKind">
@@ -11337,7 +11337,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6OK077G2Ed-tmN4hwNCxXQ" name="isAtomic" ordered="false" unique="false" lowerBound="1" eType="_6Ong0bG2Ed-tmN4hwNCxXQ" volatile="true" transient="true" derived="true"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6OK08bG2Ed-tmN4hwNCxXQ" name="direction" ordered="false" unique="false" lowerBound="1" eType="_6OK06LG2Ed-tmN4hwNCxXQ" defaultValueLiteral="inout"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK087G2Ed-tmN4hwNCxXQ" name="base_Port" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_6OK09bG2Ed-tmN4hwNCxXQ" name="MARTE_Library_MARTE_PrimitivesTypes_Boolean" instanceClassName="boolean">
@@ -11348,15 +11348,15 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK097G2Ed-tmN4hwNCxXQ" name="ClientServerPort">
<eAnnotations xmi:id="_6OK0-LG2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xgP68BHYEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK0-bG2Ed-tmN4hwNCxXQ" name="base_Port" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6OK0-7G2Ed-tmN4hwNCxXQ" name="specificationKind" ordered="false" unique="false" lowerBound="1" eType="_6OK1BbG2Ed-tmN4hwNCxXQ" volatile="true" transient="true" defaultValueLiteral="interfaceBased" derived="true"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6OK0_bG2Ed-tmN4hwNCxXQ" name="kind" ordered="false" unique="false" lowerBound="1" eType="_6OK1CrG2Ed-tmN4hwNCxXQ" defaultValueLiteral="proreq"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK0_7G2Ed-tmN4hwNCxXQ" name="provInterface" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1AbG2Ed-tmN4hwNCxXQ" name="reqInterface" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1A7G2Ed-tmN4hwNCxXQ" name="featuresSpec" ordered="false" unique="false" eType="_6OK1D7G2Ed-tmN4hwNCxXQ"/>
</eClassifiers>
@@ -11375,60 +11375,60 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK1D7G2Ed-tmN4hwNCxXQ" name="ClientServerSpecification">
<eAnnotations xmi:id="_6OK1ELG2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lOsNQBHZEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1EbG2Ed-tmN4hwNCxXQ" name="base_Interface" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK1E7G2Ed-tmN4hwNCxXQ" name="FlowSpecification">
<eAnnotations xmi:id="_6OK1FLG2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_bH1SABHZEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1FbG2Ed-tmN4hwNCxXQ" name="base_Interface" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK1F7G2Ed-tmN4hwNCxXQ" name="ClientServerFeature">
<eAnnotations xmi:id="_6OK1GLG2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_cC1EMBRWEdyCa-N9ek5e_w"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6OK1GbG2Ed-tmN4hwNCxXQ" name="kind" ordered="false" unique="false" lowerBound="1" eType="_6OK1CrG2Ed-tmN4hwNCxXQ" defaultValueLiteral="proreq"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1G7G2Ed-tmN4hwNCxXQ" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK1HbG2Ed-tmN4hwNCxXQ" name="GCMTrigger">
<eAnnotations xmi:id="_6OK1HrG2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_T6i0MEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1H7G2Ed-tmN4hwNCxXQ" name="base_Trigger" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Trigger"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Trigger"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1IbG2Ed-tmN4hwNCxXQ" name="feature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Feature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK1I7G2Ed-tmN4hwNCxXQ" name="GCMInvocationAction">
<eAnnotations xmi:id="_6OK1JLG2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vj4wkEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1JbG2Ed-tmN4hwNCxXQ" name="base_InvocationAction" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1J7G2Ed-tmN4hwNCxXQ" name="onFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Feature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK1KbG2Ed-tmN4hwNCxXQ" name="DataEvent">
<eAnnotations xmi:id="_6OK1KrG2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aXqBkEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1K7G2Ed-tmN4hwNCxXQ" name="base_AnyReceiveEvent" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//AnyReceiveEvent"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//AnyReceiveEvent"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1LbG2Ed-tmN4hwNCxXQ" name="classifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Classifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK1L7G2Ed-tmN4hwNCxXQ" name="DataPool">
<eAnnotations xmi:id="_6OK1MLG2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ewP9AEFYEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_6OK1MbG2Ed-tmN4hwNCxXQ" name="ordering" ordered="false" unique="false" lowerBound="1" eType="_6OK1ObG2Ed-tmN4hwNCxXQ" defaultValueLiteral="FIFO"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1M7G2Ed-tmN4hwNCxXQ" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1NbG2Ed-tmN4hwNCxXQ" name="insertion" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1N7G2Ed-tmN4hwNCxXQ" name="selection" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_6OK1ObG2Ed-tmN4hwNCxXQ" name="DataPoolOrderingKind">
@@ -11440,16 +11440,16 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_6OK1PrG2Ed-tmN4hwNCxXQ" name="GCMInvocatingBehavior">
<eAnnotations xmi:id="_6OK1P7G2Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_MltCULG2Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1QLG2Ed-tmN4hwNCxXQ" name="base_Behavior" ordered="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1QrG2Ed-tmN4hwNCxXQ" name="onPorts" ordered="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1RLG2Ed-tmN4hwNCxXQ" name="onFeatures" ordered="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Feature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_6OK1RrG2Ed-tmN4hwNCxXQ" name="invocations" ordered="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_6Ong0bG2Ed-tmN4hwNCxXQ" name="Boolean" instanceClassName="java.lang.String">
@@ -11470,7 +11470,7 @@
<eAnnotations xmi:id="_3q4_E5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lMax0BHYEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3q4_FJi4Ed-m0Oaexd_lJA" name="direction" ordered="false" unique="false" lowerBound="1" eType="_3q4_GJi4Ed-m0Oaexd_lJA" defaultValueLiteral="inout"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_Fpi4Ed-m0Oaexd_lJA" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_3q4_GJi4Ed-m0Oaexd_lJA" name="FlowDirectionKind">
@@ -11485,7 +11485,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3q4_IZi4Ed-m0Oaexd_lJA" name="isConjugated" ordered="false" unique="false" eType="_9nT6MJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3q4_I5i4Ed-m0Oaexd_lJA" name="direction" ordered="false" unique="false" lowerBound="1" eType="_3q4_GJi4Ed-m0Oaexd_lJA" defaultValueLiteral="inout"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_JZi4Ed-m0Oaexd_lJA" name="base_Port" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_3q4_J5i4Ed-m0Oaexd_lJA" name="MARTE_Library_MARTE_PrimitivesTypes_Boolean" instanceClassName="MARTE_Library_MARTE_PrimitivesTypes_Boolean">
@@ -11496,16 +11496,16 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3q4_KZi4Ed-m0Oaexd_lJA" name="ClientServerPort">
<eAnnotations xmi:id="_3q4_Kpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xgP68BHYEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_K5i4Ed-m0Oaexd_lJA" name="base_Port" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3q4_LZi4Ed-m0Oaexd_lJA" name="specificationKind" ordered="false" unique="false" lowerBound="1" eType="_3q4_OZi4Ed-m0Oaexd_lJA" volatile="true" transient="true" defaultValueLiteral="interfaceBased" derived="true"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3q4_L5i4Ed-m0Oaexd_lJA" name="isConjugated" ordered="false" unique="false" eType="_9nT6MJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3q4_MZi4Ed-m0Oaexd_lJA" name="kind" ordered="false" unique="false" lowerBound="1" eType="_3q4_Ppi4Ed-m0Oaexd_lJA" defaultValueLiteral="proreq"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_M5i4Ed-m0Oaexd_lJA" name="provInterface" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_NZi4Ed-m0Oaexd_lJA" name="reqInterface" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_N5i4Ed-m0Oaexd_lJA" name="featuresSpec" ordered="false" unique="false" eType="_3q4_Q5i4Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -11524,60 +11524,60 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3q4_Q5i4Ed-m0Oaexd_lJA" name="ClientServerSpecification">
<eAnnotations xmi:id="_3q4_RJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_lOsNQBHZEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_RZi4Ed-m0Oaexd_lJA" name="base_Interface" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3q4_R5i4Ed-m0Oaexd_lJA" name="FlowSpecification">
<eAnnotations xmi:id="_3q4_SJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_bH1SABHZEdyWC5IKDhzksw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_SZi4Ed-m0Oaexd_lJA" name="base_Interface" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Interface"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Interface"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3q4_S5i4Ed-m0Oaexd_lJA" name="ClientServerFeature">
<eAnnotations xmi:id="_3q4_TJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_cC1EMBRWEdyCa-N9ek5e_w"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3q4_TZi4Ed-m0Oaexd_lJA" name="kind" ordered="false" unique="false" lowerBound="1" eType="_3q4_Ppi4Ed-m0Oaexd_lJA" defaultValueLiteral="proreq"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_T5i4Ed-m0Oaexd_lJA" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3q4_UZi4Ed-m0Oaexd_lJA" name="GCMTrigger">
<eAnnotations xmi:id="_3q4_Upi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_T6i0MEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_U5i4Ed-m0Oaexd_lJA" name="base_Trigger" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Trigger"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Trigger"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_VZi4Ed-m0Oaexd_lJA" name="feature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Feature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3q4_V5i4Ed-m0Oaexd_lJA" name="GCMInvocationAction">
<eAnnotations xmi:id="_3q4_WJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_Vj4wkEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_WZi4Ed-m0Oaexd_lJA" name="base_InvocationAction" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//InvocationAction"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InvocationAction"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_W5i4Ed-m0Oaexd_lJA" name="onFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Feature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3q4_XZi4Ed-m0Oaexd_lJA" name="DataEvent">
<eAnnotations xmi:id="_3q4_Xpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_aXqBkEFXEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_X5i4Ed-m0Oaexd_lJA" name="base_AnyReceiveEvent" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//AnyReceiveEvent"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//AnyReceiveEvent"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_YZi4Ed-m0Oaexd_lJA" name="classifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Classifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_3q4_Y5i4Ed-m0Oaexd_lJA" name="DataPool">
<eAnnotations xmi:id="_3q4_ZJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ewP9AEFYEd6UW4qJC-Vahw"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3q4_ZZi4Ed-m0Oaexd_lJA" name="ordering" ordered="false" unique="false" lowerBound="1" eType="_3q4_bZi4Ed-m0Oaexd_lJA" defaultValueLiteral="FIFO"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_Z5i4Ed-m0Oaexd_lJA" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_aZi4Ed-m0Oaexd_lJA" name="insertion" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3q4_a5i4Ed-m0Oaexd_lJA" name="selection" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_3q4_bZi4Ed-m0Oaexd_lJA" name="DataPoolOrderingKind">
@@ -11607,8 +11607,8 @@
</elementImport>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_lMax0BHYEdyWC5IKDhzksw" name="FlowProperty">
<ownedAttribute xmi:id="_rG6aUBHYEdyWC5IKDhzksw" name="direction" visibility="public" type="_mmbRsBHYEdyWC5IKDhzksw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hV_m8BRWEdyCa-N9ek5e_w" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hV118BRWEdyCa-N9ek5e_w" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hV_m8BRWEdyCa-N9ek5e_w" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_uKQ2kBHYEdyWC5IKDhzksw" value="inout"/>
</ownedAttribute>
<ownedAttribute xmi:id="_wccUkBHYEdyWC5IKDhzksw" name="base_Property" isUnique="false" association="_wb_ooBHYEdyWC5IKDhzksw">
@@ -11644,12 +11644,12 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_xKMLYBHYEdyWC5IKDhzksw" name="FlowPort">
<ownedAttribute xmi:id="_y8LtcBHYEdyWC5IKDhzksw" name="isAtomic" visibility="public" isUnique="false" isDerived="true">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-oOd0RHYEdyWC5IKDhzksw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-oOd0BHYEdyWC5IKDhzksw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-oOd0RHYEdyWC5IKDhzksw" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_zCvocBHYEdyWC5IKDhzksw" name="direction" visibility="public" type="_mmbRsBHYEdyWC5IKDhzksw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eNej8EFUEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eNLpAEFUEd6UW4qJC-Vahw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eNej8EFUEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_C170YRHZEdyWC5IKDhzksw" value="inout"/>
</ownedAttribute>
<ownedAttribute xmi:id="_I_xgcBHZEdyWC5IKDhzksw" name="base_Port" isUnique="false" association="_I_LDgBHZEdyWC5IKDhzksw">
@@ -11679,28 +11679,28 @@
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
</ownedAttribute>
<ownedAttribute xmi:id="_N_QSMBHZEdyWC5IKDhzksw" name="specificationKind" visibility="public" type="_LptasEE8Ed6UW4qJC-Vahw" isUnique="false" isDerived="true">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_QSMRHZEdyWC5IKDhzksw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N_QSMhHZEdyWC5IKDhzksw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_QSMRHZEdyWC5IKDhzksw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_tO9UMEFWEd6UW4qJC-Vahw" value="interfaceBased"/>
</ownedAttribute>
<ownedAttribute xmi:id="_N_QSOBHZEdyWC5IKDhzksw" name="kind" visibility="public" type="_DdY_gBRWEdyCa-N9ek5e_w" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_QSORHZEdyWC5IKDhzksw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N_QSOhHZEdyWC5IKDhzksw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N_QSORHZEdyWC5IKDhzksw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_N_QSOxHZEdyWC5IKDhzksw" value="proreq"/>
</ownedAttribute>
<ownedAttribute xmi:id="_IEghsEFUEd6UW4qJC-Vahw" name="provInterface" isUnique="false" association="_IAK0QEFUEd6UW4qJC-Vahw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IFgAMEFUEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IFdj8EFUEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IFgAMEFUEd6UW4qJC-Vahw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_MEBrQEFUEd6UW4qJC-Vahw" name="reqInterface" isUnique="false" association="_MBIIQEFUEd6UW4qJC-Vahw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MFBJwEFUEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ME-GcEFUEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MFBJwEFUEd6UW4qJC-Vahw" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_QfslUEFUEd6UW4qJC-Vahw" name="featuresSpec" type="_lOsNQBHZEdyWC5IKDhzksw" isUnique="false" association="_Qbzj0EFUEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WtC4YEFUEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ws0O4EFUEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WtC4YEFUEd6UW4qJC-Vahw" value="1"/>
</ownedAttribute>
<icon xmi:id="_VYRVkHBVEd2Nss_u28cvSA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%5%0%0%0%10%8%2%0%0%0%-13%91%3%103%0%0%0%1%115%82%71%66%0%-82%-50%28%-23%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%32%99%72%82%77%0%0%122%38%0%0%-128%-124%0%0%-6%0%0%0%-128%-24%0%0%117%48%0%0%-22%96%0%0%58%-104%0%0%23%112%-100%-70%81%60%0%0%0%113%73%68%65%84%24%87%69%-51%-79%17%64%17%12%6%96%-74%48%-122%17%-116%96%4%58%59%40%-108%74%-107%83%26%65%105%12%-91%21%116%74%58%47%30%119%-46%36%-33%37%-71%31%-81%-75%-48%95%-83%-75%57%39%2%67%57%-25%8%33%49%-58%109%107%-83%82%-22%44%80%41%-123%82%122%-80%-83%-75%54%-58%60%75%41%-67%-9%-49%41%37%-50%-7%51%76%-116%-79%-100%-13%-3%-121%-42%123%-121%19%33%68%-83%-11%-26%-113%49%32%60%-124%-16%1%-49%-8%112%-111%72%93%-123%-80%0%0%0%0%73%69%78%68%-82%66%96%-126%">
<eAnnotations xmi:id="_bR9FwHBVEd2Nss_u28cvSA" source="image_papyrus">
@@ -11750,8 +11750,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_cC1EMBRWEdyCa-N9ek5e_w" name="ClientServerFeature">
<ownedAttribute xmi:id="_dip4MBRWEdyCa-N9ek5e_w" name="kind" visibility="public" type="_DdY_gBRWEdyCa-N9ek5e_w" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fIRyMBRWEdyCa-N9ek5e_w" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fIIBMBRWEdyCa-N9ek5e_w" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fIRyMBRWEdyCa-N9ek5e_w" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_fIbjMBRWEdyCa-N9ek5e_w" value="proreq"/>
</ownedAttribute>
<ownedAttribute xmi:id="_wLpMkBRWEdyCa-N9ek5e_w" name="base_BehavioralFeature" isUnique="false" association="_wKJ-0BRWEdyCa-N9ek5e_w">
@@ -11786,20 +11786,20 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_IAK0QEFUEd6UW4qJC-Vahw" name="A_ClientServerPort_Interface" memberEnd="_IEghsEFUEd6UW4qJC-Vahw _IFjqkEFUEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_IFjqkEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_IAK0QEFUEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IGISUEFUEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IGLVoEFUEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IGISUEFUEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_MBIIQEFUEd6UW4qJC-Vahw" name="A_ClientServerPort_Interface" memberEnd="_MEBrQEFUEd6UW4qJC-Vahw _MFKTsEFUEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_MFKTsEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_MBIIQEFUEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MFzz8EFUEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MF2QMEFUEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MFzz8EFUEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_Qbzj0EFUEd6UW4qJC-Vahw" name="A_ClientServerPort_ClientServerSpecification" memberEnd="_QfslUEFUEd6UW4qJC-Vahw _Qg0msEFUEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_Qg0msEFUEd6UW4qJC-Vahw" name="clientServerPort" type="_xgP68BHYEdyWC5IKDhzksw" isUnique="false" association="_Qbzj0EFUEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QhZOcEFUEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QhbqsEFUEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QhZOcEFUEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_T6i0MEFXEd6UW4qJC-Vahw" name="GCMTrigger">
@@ -11808,8 +11808,8 @@
</ownedAttribute>
<ownedAttribute xmi:id="_NoNeAEFYEd6UW4qJC-Vahw" name="feature" isUnique="false" association="_Ni0nsEFYEd6UW4qJC-Vahw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVW8UEFYEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PVPAgEFYEd6UW4qJC-Vahw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVW8UEFYEd6UW4qJC-Vahw" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Vj4wkEFXEd6UW4qJC-Vahw" name="GCMInvocationAction">
@@ -11818,8 +11818,8 @@
</ownedAttribute>
<ownedAttribute xmi:id="_KMTX0EFYEd6UW4qJC-Vahw" name="onFeature" isUnique="false" association="_KIhEAEFYEd6UW4qJC-Vahw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MQakoEFYEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MQT28EFYEd6UW4qJC-Vahw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MQakoEFYEd6UW4qJC-Vahw" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_aXqBkEFXEd6UW4qJC-Vahw" name="DataEvent">
@@ -11828,8 +11828,8 @@
</ownedAttribute>
<ownedAttribute xmi:id="_VBagMEFYEd6UW4qJC-Vahw" name="classifier" isUnique="false" association="_U8OeMEFYEd6UW4qJC-Vahw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WfmVcEFYEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WfPwIEFYEd6UW4qJC-Vahw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WfmVcEFYEd6UW4qJC-Vahw" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_56UXEEFXEd6UW4qJC-Vahw" name="Extension_GCMTrigger" memberEnd="_5-nBMEFXEd6UW4qJC-Vahw _5-58IEFXEd6UW4qJC-Vahw">
@@ -11840,14 +11840,14 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_KIhEAEFYEd6UW4qJC-Vahw" name="A_GCMInvocationAction_Feature" memberEnd="_KMTX0EFYEd6UW4qJC-Vahw _KM3_kEFYEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_KM3_kEFYEd6UW4qJC-Vahw" name="gCMInvocationAction" type="_Vj4wkEFXEd6UW4qJC-Vahw" isUnique="false" association="_KIhEAEFYEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KNecgEFYEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KNhf0EFYEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KNecgEFYEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_Ni0nsEFYEd6UW4qJC-Vahw" name="A_GCMTrigger_Feature" memberEnd="_NoNeAEFYEd6UW4qJC-Vahw _NpDLgEFYEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_NpDLgEFYEd6UW4qJC-Vahw" name="gCMTrigger" type="_T6i0MEFXEd6UW4qJC-Vahw" isUnique="false" association="_Ni0nsEFYEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Np9xgEFYEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NqA00EFYEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Np9xgEFYEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_TADFYEFYEd6UW4qJC-Vahw" name="Extension_DataEvent" memberEnd="_TFWcIEFYEd6UW4qJC-Vahw _TF4AkEFYEd6UW4qJC-Vahw">
@@ -11855,14 +11855,14 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_U8OeMEFYEd6UW4qJC-Vahw" name="A_DataEvent_Classifier" memberEnd="_VBagMEFYEd6UW4qJC-Vahw _VCXicEFYEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_VCXicEFYEd6UW4qJC-Vahw" name="dataEvent" type="_aXqBkEFXEd6UW4qJC-Vahw" isUnique="false" association="_U8OeMEFYEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VDVy0EFYEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VDZdMEFYEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VDVy0EFYEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_ewP9AEFYEd6UW4qJC-Vahw" name="DataPool">
<ownedAttribute xmi:id="_gfUt8EFYEd6UW4qJC-Vahw" name="ordering" visibility="public" type="_h8ugEEFYEd6UW4qJC-Vahw" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_stn20EFYEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_stZNUEFYEd6UW4qJC-Vahw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_stn20EFYEd6UW4qJC-Vahw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_st3HYEFYEd6UW4qJC-Vahw" value="FIFO"/>
</ownedAttribute>
<ownedAttribute xmi:id="_yuJO0EFYEd6UW4qJC-Vahw" name="base_Property" isUnique="false" association="_yoRQUEFYEd6UW4qJC-Vahw">
@@ -11870,13 +11870,13 @@
</ownedAttribute>
<ownedAttribute xmi:id="_3rZL8EFYEd6UW4qJC-Vahw" name="insertion" isUnique="false" association="_3jAE8EFYEd6UW4qJC-Vahw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8erUwEFYEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8efukEFYEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8erUwEFYEd6UW4qJC-Vahw" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_4kCrMEFYEd6UW4qJC-Vahw" name="selection" isUnique="false" association="_4byuIEFYEd6UW4qJC-Vahw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_983xEEFYEd6UW4qJC-Vahw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_98uAEEFYEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_983xEEFYEd6UW4qJC-Vahw" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_h8ugEEFYEd6UW4qJC-Vahw" name="DataPoolOrderingKind">
@@ -11889,14 +11889,14 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_3jAE8EFYEd6UW4qJC-Vahw" name="A_DataPool_Behavior" memberEnd="_3rZL8EFYEd6UW4qJC-Vahw _3sbtwEFYEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_3sbtwEFYEd6UW4qJC-Vahw" name="dataPool" type="_ewP9AEFYEd6UW4qJC-Vahw" isUnique="false" association="_3jAE8EFYEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3tYI8EFYEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3tfdsEFYEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3tYI8EFYEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_4byuIEFYEd6UW4qJC-Vahw" name="A_DataPool_Behavior" memberEnd="_4kCrMEFYEd6UW4qJC-Vahw _4lF0EEFYEd6UW4qJC-Vahw">
<ownedEnd xmi:id="_4lF0EEFYEd6UW4qJC-Vahw" name="dataPool" type="_ewP9AEFYEd6UW4qJC-Vahw" isUnique="false" association="_4byuIEFYEd6UW4qJC-Vahw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4mHHwEFYEd6UW4qJC-Vahw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4mMAQEFYEd6UW4qJC-Vahw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4mHHwEFYEd6UW4qJC-Vahw" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_MltCULG2Ed-tmN4hwNCxXQ" name="GCMInvocatingBehavior">
@@ -11905,24 +11905,24 @@
</ownedAttribute>
<ownedAttribute xmi:id="_a4JNMLG2Ed-tmN4hwNCxXQ" name="onPorts" visibility="public">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cwzX8LG2Ed-tmN4hwNCxXQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cwqOALG2Ed-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cwzX8LG2Ed-tmN4hwNCxXQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cw9I8LG2Ed-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_epTxsLG2Ed-tmN4hwNCxXQ" name="onFeatures" visibility="public">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ger-8LG2Ed-tmN4hwNCxXQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gei1ALG2Ed-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ger-8LG2Ed-tmN4hwNCxXQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ge1v8LG2Ed-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ht8AULG2Ed-tmN4hwNCxXQ" name="invocations" visibility="public">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InvocationAction"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kxOLILG2Ed-tmN4hwNCxXQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kw7QMLG2Ed-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kxOLILG2Ed-tmN4hwNCxXQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kxOLIbG2Ed-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -11933,7 +11933,7 @@
</packagedElement>
</packagedElement>
</packagedElement>
- <packagedElement xmi:type="uml:Package" xmi:id="_u8y4wAPMEdyuUt-4qHuVvQ" name="MARTE_AnalysisModel" clientDependency="_zyMT8A9dEdy-lroUn0KWEw">
+ <packagedElement xmi:type="uml:Package" xmi:id="_u8y4wAPMEdyuUt-4qHuVvQ" clientDependency="_zyMT8A9dEdy-lroUn0KWEw" name="MARTE_AnalysisModel">
<packagedElement xmi:type="uml:Profile" xmi:id="_4bV20APMEdyuUt-4qHuVvQ" name="GQAM">
<eAnnotations xmi:id="_329sMJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML">
<contents xmi:type="ecore:EPackage" xmi:id="_b-O2ELG3Ed-tmN4hwNCxXQ" name="GQAM" nsURI="http://www.eclipse.org/papyrus/GQAM/1" nsPrefix="GQAM">
@@ -11948,7 +11948,7 @@
<eAnnotations xmi:id="_b-O2ErG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_YzhUsBKXEdyGYuetzx6T5A"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-O2E7G3Ed-tmN4hwNCxXQ" name="pop" ordered="false" unique="false" eType="_f1pzkLG3Ed-tmN4hwNCxXQ" defaultValueLiteral="1"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O2FbG3Ed-tmN4hwNCxXQ" name="base_Behavior" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b-O2F7G3Ed-tmN4hwNCxXQ" name="MARTE_Library_BasicNFP_Types_NFP_Integer" instanceClassName="java.lang.String">
@@ -11962,7 +11962,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-O2HbG3Ed-tmN4hwNCxXQ" name="format" ordered="false" unique="false" eType="_f2GfgLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-O2H7G3Ed-tmN4hwNCxXQ" name="location" ordered="false" unique="false" eType="_f2GfgLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O2IbG3Ed-tmN4hwNCxXQ" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b-O2I7G3Ed-tmN4hwNCxXQ" name="MARTE_Library_MARTE_PrimitivesTypes_String" instanceClassName="java.lang.String">
@@ -11977,10 +11977,10 @@
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O2K7G3Ed-tmN4hwNCxXQ" name="trace" ordered="false" unique="false" eType="_b-O2GbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O2LbG3Ed-tmN4hwNCxXQ" name="effect" ordered="false" unique="false" eType="_b-O2NbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O2L7G3Ed-tmN4hwNCxXQ" name="timedEvent" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeEvent"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeEvent"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O2MbG3Ed-tmN4hwNCxXQ" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b-O2M7G3Ed-tmN4hwNCxXQ" name="MARTE_Library_BasicNFP_Types_ArrivalPattern" instanceClassName="java.lang.String">
@@ -12140,17 +12140,17 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-O3WbG3Ed-tmN4hwNCxXQ" name="GaRequestedService" eSuperTypes="_b-O22bG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b-O3WrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_gCsw0BKaEdyGYuetzx6T5A"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O3W7G3Ed-tmN4hwNCxXQ" name="base_Operation" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-O3XrG3Ed-tmN4hwNCxXQ" name="GaTimedObs" eSuperTypes="_b7Zkl7G3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b-O3X7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_En1FMBKcEdymP89M8JXkzA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-O3YLG3Ed-tmN4hwNCxXQ" name="laxity" unique="false" eType="_b-O3eLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O3YrG3Ed-tmN4hwNCxXQ" name="startObs" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeObservation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeObservation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O3ZLG3Ed-tmN4hwNCxXQ" name="endObs" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeObservation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeObservation"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_b-O3b7G3Ed-tmN4hwNCxXQ" name="MARTE_MARTE_Foundations_NFPs_ConstraintKind">
@@ -12218,7 +12218,7 @@
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O3wrG3Ed-tmN4hwNCxXQ" name="behavior" ordered="false" unique="false" upperBound="-1" eType="_b-O2NbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O3xLG3Ed-tmN4hwNCxXQ" name="demand" ordered="false" unique="false" upperBound="-1" eType="_b-O2JbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O3xrG3Ed-tmN4hwNCxXQ" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-O3yLG3Ed-tmN4hwNCxXQ" name="GaAnalysisContext" eSuperTypes="_b-riObG3Ed-tmN4hwNCxXQ _b7sgqrG3Ed-tmN4hwNCxXQ">
@@ -12236,7 +12236,7 @@
<eAnnotations xmi:id="_b-O34bG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_JSAYgBKgEdyaWJN1BYon3A"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O34rG3Ed-tmN4hwNCxXQ" name="resources" ordered="false" unique="false" upperBound="-1" eType="_b7sfcbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-O35LG3Ed-tmN4hwNCxXQ" name="base_Classifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Classifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_f1pzkLG3Ed-tmN4hwNCxXQ" name="NFP_Integer" instanceClassName="java.lang.String">
@@ -12336,7 +12336,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_329sMpi4Ed-m0Oaexd_lJA" name="GaWorkloadGenerator">
<eAnnotations xmi:id="_329sM5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_YzhUsBKXEdyGYuetzx6T5A"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329sNpi4Ed-m0Oaexd_lJA" name="base_Behavior" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9uA_IJi4Ed-m0Oaexd_lJA" name="pop" ordered="false" unique="false" eType="_9uA_Ipi4Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -12391,7 +12391,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_329sr5i4Ed-m0Oaexd_lJA" name="format" ordered="false" unique="false" eType="_9vzu4Ji4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_329ssZi4Ed-m0Oaexd_lJA" name="location" ordered="false" unique="false" eType="_9vzu4Ji4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329ss5i4Ed-m0Oaexd_lJA" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_329stZi4Ed-m0Oaexd_lJA" name="MARTE_Library_MARTE_PrimitivesTypes_String" instanceClassName="MARTE_Library_MARTE_PrimitivesTypes_String">
@@ -12405,10 +12405,10 @@
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329svZi4Ed-m0Oaexd_lJA" name="trace" ordered="false" unique="false" eType="_329sq5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329sv5i4Ed-m0Oaexd_lJA" name="effect" ordered="false" unique="false" eType="_329tN5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329swZi4Ed-m0Oaexd_lJA" name="timedEvent" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeEvent"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeEvent"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329sw5i4Ed-m0Oaexd_lJA" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9xABsJi4Ed-m0Oaexd_lJA" name="pattern" ordered="false" unique="false" eType="_9xABspi4Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -12565,17 +12565,17 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_329unJi4Ed-m0Oaexd_lJA" name="GaRequestedService" eSuperTypes="_329t75i4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_329unZi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_gCsw0BKaEdyGYuetzx6T5A"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329unpi4Ed-m0Oaexd_lJA" name="base_Operation" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Operation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_329uoZi4Ed-m0Oaexd_lJA" name="GaTimedObs" eSuperTypes="_0smpFpi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_329uopi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_En1FMBKcEdymP89M8JXkzA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_329uo5i4Ed-m0Oaexd_lJA" name="laxity" ordered="false" unique="false" eType="_329uu5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329upZi4Ed-m0Oaexd_lJA" name="startObs" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeObservation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeObservation"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329up5i4Ed-m0Oaexd_lJA" name="endObs" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeObservation"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//TimeObservation"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EEnum" xmi:id="_329uspi4Ed-m0Oaexd_lJA" name="MARTE_MARTE_Foundations_NFPs_ConstraintKind">
@@ -12641,7 +12641,7 @@
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329vJ5i4Ed-m0Oaexd_lJA" name="behavior" ordered="false" unique="false" upperBound="-1" eType="_329tN5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329vKZi4Ed-m0Oaexd_lJA" name="demand" ordered="false" unique="false" upperBound="-1" eType="_329st5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329vK5i4Ed-m0Oaexd_lJA" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_329vLZi4Ed-m0Oaexd_lJA" name="GaAnalysisContext" eSuperTypes="_4UxCt5i4Ed-m0Oaexd_lJA _1A3pOpi4Ed-m0Oaexd_lJA">
@@ -12654,7 +12654,7 @@
<eAnnotations xmi:id="_329vSZi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_JSAYgBKgEdyaWJN1BYon3A"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329vSpi4Ed-m0Oaexd_lJA" name="resources" ordered="false" unique="false" upperBound="-1" eType="_0-x-Ipi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_329vTJi4Ed-m0Oaexd_lJA" name="base_Classifier" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Classifier"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_9uA_Ipi4Ed-m0Oaexd_lJA" name="NFP_Integer" instanceClassName="java.lang.String">
@@ -12743,8 +12743,8 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_YzhUsBKXEdyGYuetzx6T5A" name="GaWorkloadGenerator">
<ownedAttribute xmi:id="_aRcrQBKXEdyGYuetzx6T5A" name="pop" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dzWrwBKXEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dzNh0BKXEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dzWrwBKXEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_dzgcwBKXEdyGYuetzx6T5A" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_tDo-8BKXEdyGYuetzx6T5A" name="base_Behavior" isUnique="false" association="_tCwOIBKXEdyGYuetzx6T5A">
@@ -12757,24 +12757,24 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_4cVVgBKXEdyGYuetzx6T5A" name="GaEventTrace">
<ownedAttribute xmi:id="_55hFMBKXEdyGYuetzx6T5A" name="content" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7htLABKXEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7hjaABKXEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7htLABKXEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_7h2U8BKXEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_587lkBKXEdyGYuetzx6T5A" name="format" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9TQoMBKXEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9TG3MBKXEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9TQoMBKXEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_9TaZMBKXEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_6Apn8BKXEdyGYuetzx6T5A" name="location" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-4x0gBKXEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-4oDgBKXEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-4x0gBKXEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-46-cBKXEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
@@ -12789,37 +12789,37 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_CGyBkBKYEdyGYuetzx6T5A" name="GaWorkloadEvent">
<ownedAttribute xmi:id="_DurMcBKYEdyGYuetzx6T5A" name="pattern" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_VDec8BFXEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FqMd8BKYEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Fp478BKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FqMd8BKYEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FqMd8RKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Dxf28BKYEdyGYuetzx6T5A" name="generator" visibility="public" type="_YzhUsBKXEdyGYuetzx6T5A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KTwDABKYEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KTm5EBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KTwDABKYEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_KTwDARKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_D0xNYBKYEdyGYuetzx6T5A" name="trace" visibility="public" type="_4cVVgBKXEdyGYuetzx6T5A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-K9cBKYEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L-BzgBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-K9cBKYEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_L-UucBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_D5hxkBKYEdyGYuetzx6T5A" name="effect" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O1vAcBKYEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_O1cFgBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O1vAcBKYEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_O14xcBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_X0yJoBKZEdyGYuetzx6T5A" name="timedEvent" isUnique="false" association="_X0enoBKZEdyGYuetzx6T5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeEvent"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cDmTcBKZEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cDcicBKZEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cDmTcBKZEdyGYuetzx6T5A" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_4iNCEBKZEdyGYuetzx6T5A" name="base_NamedElement" isUnique="false" association="_4hURQBKZEdyGYuetzx6T5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>
@@ -12829,179 +12829,179 @@
<generalization xmi:id="_HsMVcBKZEdyGYuetzx6T5A" general="_8JKLcBG5Edyb1KzJ7GkiGA"/>
<generalization xmi:id="_IK9VEBKZEdyGYuetzx6T5A" general="_3V3e0BD5EdyybZnLxHsjyA"/>
<ownedAttribute xmi:id="_aAzxwBKYEdyGYuetzx6T5A" name="cause" visibility="public" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lCEfwBKYEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lB7V0BKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lCEfwBKYEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_lCOQwBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aDyNQBKYEdyGYuetzx6T5A" name="hostDemand" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nPbIIBKYEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nPINMBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nPbIIBKYEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nPbIIRKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aGm3wBKYEdyGYuetzx6T5A" name="hostDemandOps" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pU5m4BKYEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pUv14BKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pU5m4BKYEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_pU5m4RKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aJlTQBKYEdyGYuetzx6T5A" name="interOccT" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r4QUcBKYEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r4GjcBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r4QUcBKYEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_r4jPYBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aMs4sBKYEdyGYuetzx6T5A" name="throughput" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u_bgwBKYEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u_RvwBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u_bgwBKYEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_u_kqsBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aP0eIBKYEdyGYuetzx6T5A" name="respT" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__qovcGqgEdyHVMM3AaZxvA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__qlsIGqgEdyHVMM3AaZxvA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__qovcGqgEdyHVMM3AaZxvA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_xYrQEBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aS8qoBKYEdyGYuetzx6T5A" name="utilization" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zy9hMBKYEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zyzwMBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zy9hMBKYEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_zzGrIBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aWEQEBKYEdyGYuetzx6T5A" name="utilizationOnHost" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2_MMoBKYEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2_CboBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2_MMoBKYEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_2DI0EBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aZL1gBKYEdyGYuetzx6T5A" name="root" visibility="public" type="_eXMtwBKZEdyGYuetzx6T5A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BMvlwBKZEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BMmb0BKZEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BMvlwBKZEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8QS54BKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_acTa8BKYEdyGYuetzx6T5A" name="timing" visibility="public" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__xoSoBKYEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__xfIsBKYEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__xoSoBKYEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__xyDoBKYEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_PVZ_QLG1Ed-tmN4hwNCxXQ" name="steps" type="_eXMtwBKZEdyGYuetzx6T5A" association="_PVjJMLG1Ed-tmN4hwNCxXQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVZ_QbG1Ed-tmN4hwNCxXQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PVZ_QrG1Ed-tmN4hwNCxXQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVZ_QbG1Ed-tmN4hwNCxXQ" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_TkyJwLG1Ed-tmN4hwNCxXQ" name="parentStep" type="_eXMtwBKZEdyGYuetzx6T5A" association="_TkyJw7G1Ed-tmN4hwNCxXQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TkyJwbG1Ed-tmN4hwNCxXQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TkyJwrG1Ed-tmN4hwNCxXQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TkyJwbG1Ed-tmN4hwNCxXQ" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_X0enoBKZEdyGYuetzx6T5A" name="Association_GaWorkloadEvent_TimeEvent" memberEnd="_X0yJoBKZEdyGYuetzx6T5A _X10rcBKZEdyGYuetzx6T5A">
<ownedEnd xmi:id="_X10rcBKZEdyGYuetzx6T5A" name="gaWorkloadEvent" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false" association="_X0enoBKZEdyGYuetzx6T5A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X2kSUBKZEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X2tcQBKZEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X2kSUBKZEdyGYuetzx6T5A" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_eXMtwBKZEdyGYuetzx6T5A" name="GaStep">
<generalization xmi:id="_gbL-wBKZEdyGYuetzx6T5A" general="_XYaMIBKYEdyGYuetzx6T5A"/>
<ownedAttribute xmi:id="_5pjrsBKZEdyGYuetzx6T5A" name="isAtomic" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C-VpwBKaEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C-L4wBKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C-VpwBKaEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_C-fawBKaEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_5qJhkBKZEdyGYuetzx6T5A" name="blockT" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2dbU4EOFEd6caK5ICj_pSQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2dJoEEOFEd6caK5ICj_pSQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2dbU4EOFEd6caK5ICj_pSQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FNVQ4BKaEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_5xk_QBKZEdyGYuetzx6T5A" name="rep" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uI6osEIfEd6dmI2dd6jVFQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uIsmQEIfEd6dmI2dd6jVFQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uI6osEIfEd6dmI2dd6jVFQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Ha1DMBKaEdyGYuetzx6T5A" value="1.0"/>
</ownedAttribute>
<ownedAttribute xmi:id="_5143gBKZEdyGYuetzx6T5A" name="prob" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LWVPcBKaEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LWLecBKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LWVPcBKaEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LWVPcRKaEdyGYuetzx6T5A" value="1.0"/>
</ownedAttribute>
<ownedAttribute xmi:id="_55500BKZEdyGYuetzx6T5A" name="priority" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NiWbEBKaEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NiMqEBKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NiWbEBKaEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NiflABKaEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_59xBIBKZEdyGYuetzx6T5A" name="concurRes" visibility="public" type="_1zYucBG0Edyb1KzJ7GkiGA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q41OsBKaEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q4sEwBKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q41OsBKaEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Q4-_sBKaEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_6BMIkBKZEdyGYuetzx6T5A" name="host" visibility="public" type="_MDZCYBKdEdymP89M8JXkzA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TCnlsBKaEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TCebwBKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TCnlsBKaEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TCxWsBKaEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_6FDU4BKZEdyGYuetzx6T5A" name="servDemand" visibility="public" type="_gCsw0BKaEdyGYuetzx6T5A" isOrdered="true" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XqRGQBKaEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XqHVQBKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XqRGQBKaEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_XqaQMBKaEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_6InmQBKZEdyGYuetzx6T5A" name="servCount" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ceGBoBKaEdyGYuetzx6T5A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cd8QoBKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ceGBoBKaEdyGYuetzx6T5A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cePyoBKaEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_I1gR0DL6Ed2HYNz2hI9A2g" name="selfDelay" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zjA54EIfEd6dmI2dd6jVFQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ziy3cEIfEd6dmI2dd6jVFQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zjA54EIfEd6dmI2dd6jVFQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_KT_CADL6Ed2HYNz2hI9A2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_PVjJMbG1Ed-tmN4hwNCxXQ" name="scenario" type="_XYaMIBKYEdyGYuetzx6T5A" association="_PVjJMLG1Ed-tmN4hwNCxXQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVjJMrG1Ed-tmN4hwNCxXQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PVjJM7G1Ed-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PVjJMrG1Ed-tmN4hwNCxXQ" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_TkyJxLG1Ed-tmN4hwNCxXQ" name="childScenario" type="_XYaMIBKYEdyGYuetzx6T5A" association="_TkyJw7G1Ed-tmN4hwNCxXQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TkyJxbG1Ed-tmN4hwNCxXQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TkyJxrG1Ed-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TkyJxbG1Ed-tmN4hwNCxXQ" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Extension" xmi:id="_4hURQBKZEdyGYuetzx6T5A" name="Extension_GaWorkloadEvent" memberEnd="_4hnMMBKZEdyGYuetzx6T5A _4iNCEBKZEdyGYuetzx6T5A">
@@ -13022,53 +13022,53 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_3P53QBKaEdyGYuetzx6T5A" name="GaAcqStep">
<generalization xmi:id="__6xVoBKaEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
<ownedAttribute xmi:id="_4kVTkBKaEdyGYuetzx6T5A" name="acqRes" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7J6OsBKaEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7JxEwBKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7J6OsBKaEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_7KD_sBKaEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_70IQYBKaEdyGYuetzx6T5A" name="resUnits" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-vRL0RKaEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-vRL0BKaEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-vRL0RKaEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-vaVwBKaEdyGYuetzx6T5A" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_G9mfMBKbEdyGYuetzx6T5A" name="GaRelStep">
<generalization xmi:id="_RHKJIBKbEdyGYuetzx6T5A" general="_eXMtwBKZEdyGYuetzx6T5A"/>
<ownedAttribute xmi:id="_IhCn4BKbEdyGYuetzx6T5A" name="relRes" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LsFAgBKbEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Lr72kBKbEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LsFAgBKbEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LsOxgBKbEdyGYuetzx6T5A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Ikm5QBKbEdyGYuetzx6T5A" name="resUnits" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nz8E4BKbEdyGYuetzx6T5A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NzyT4BKbEdyGYuetzx6T5A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nz8E4BKbEdyGYuetzx6T5A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_N0FO0BKbEdyGYuetzx6T5A" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_En1FMBKcEdymP89M8JXkzA" name="GaTimedObs">
<generalization xmi:id="_q7M5gBKcEdymP89M8JXkzA" general="_P9c2AA4wEdysTsAUPnp57Q"/>
<ownedAttribute xmi:id="_KjAqMBKcEdymP89M8JXkzA" name="laxity" visibility="public" type="_Gs3fEBKcEdymP89M8JXkzA" isOrdered="true" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MQtiIBKcEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MQjxIBKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MQtiIBKcEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_MQ2sEBKcEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_QBqEMBKcEdymP89M8JXkzA" name="startObs" isOrdered="true" isUnique="false" association="_QBNYQBKcEdymP89M8JXkzA">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeObservation"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U5y30BKcEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U5pt4BKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U5y30BKcEdymP89M8JXkzA" value="*"/>
</ownedAttribute>
<ownedAttribute xmi:id="_XM8mMBKcEdymP89M8JXkzA" name="endObs" isOrdered="true" isUnique="false" association="_XMprQBKcEdymP89M8JXkzA">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeObservation"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y1JTEBKcEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y1AJIBKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y1JTEBKcEdymP89M8JXkzA" value="*"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_Gs3fEBKcEdymP89M8JXkzA" name="LaxityKind">
@@ -13078,46 +13078,46 @@
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_QBNYQBKcEdymP89M8JXkzA" name="Association_GaTimingObs_TimeObservation" memberEnd="_QBqEMBKcEdymP89M8JXkzA _QCsmABKcEdymP89M8JXkzA">
<ownedEnd xmi:id="_QCsmABKcEdymP89M8JXkzA" name="gaTimingObs" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false" association="_QBNYQBKcEdymP89M8JXkzA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QDlW0BKcEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QDlW0RKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QDlW0BKcEdymP89M8JXkzA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Association" xmi:id="_XMprQBKcEdymP89M8JXkzA" name="Association_GaTimingObs_TimeObservation" memberEnd="_XM8mMBKcEdymP89M8JXkzA _XN_vEBKcEdymP89M8JXkzA">
<ownedEnd xmi:id="_XN_vEBKcEdymP89M8JXkzA" name="gaTimingObs" type="_En1FMBKcEdymP89M8JXkzA" isUnique="false" association="_XMprQBKcEdymP89M8JXkzA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XO4f4BKcEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XO4f4RKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XO4f4BKcEdymP89M8JXkzA" value="*"/>
</ownedEnd>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_a6Ls8BKcEdymP89M8JXkzA" name="GaLatencyObs">
<generalization xmi:id="_nXosIBKcEdymP89M8JXkzA" general="_En1FMBKcEdymP89M8JXkzA"/>
<ownedAttribute xmi:id="_cVcKABKcEdymP89M8JXkzA" name="latency" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gEmjYBKcEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gEdZcBKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gEmjYBKcEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gEmjYRKcEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ce9SYBKcEdymP89M8JXkzA" name="miss" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iAuR0BKcEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iAkg0BKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iAuR0BKcEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_iA3bwBKcEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ci-PsBKcEdymP89M8JXkzA" name="utility" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_4TENQBEBEdyx6M3BlUjlCQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kIIqQBKcEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kH-5QBKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kIIqQBKcEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kIR0MBKcEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_cmYwEBKcEdymP89M8JXkzA" name="maxJitter" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l7CLQBKcEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l64aQBKcEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l7CLQBKcEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_l7VGMBKcEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
@@ -13128,64 +13128,64 @@
<generalization xmi:id="_UsdCwDLbEd2HYNz2hI9A2g" general="_e_tF0BG1Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_ONVKYBKdEdymP89M8JXkzA" name="commTxOvh" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_USUysBKdEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_USLBsBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_USUysBKdEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_USd8oBKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OQAq8BKdEdymP89M8JXkzA" name="commRcvOvh" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WOlrEBKdEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WOb6EBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WOlrEBKdEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_WOu1ABKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OSiagBKdEdymP89M8JXkzA" name="cntxtSwT" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y7J_ABKdEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y7AOABKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y7J_ABKdEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Y7TwABKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OWGr4BKdEdymP89M8JXkzA" name="clockOvh" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bSUqsBKdEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bSK5sBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bSUqsBKdEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bSebsBKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OZYCUBKdEdymP89M8JXkzA" name="schedPriRange" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_ehpdoBEBEdyx6M3BlUjlCQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jxJ4MBKdEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jxAuQBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jxJ4MBKdEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jxTpMBKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OcyisBKdEdymP89M8JXkzA" name="memSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lyePsBKdEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lyUesBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lyePsBKdEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_lyxKoBKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_OgW0EBKdEdymP89M8JXkzA" name="utilization" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n6xY8BKdEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n6oPABKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n6xY8BKdEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_n67J8BKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_Oj7FcBKdEdymP89M8JXkzA" name="throughput" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qK9S4BKdEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qKzh4BKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qK9S4BKdEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_qLGc0BKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
@@ -13196,16 +13196,16 @@
<generalization xmi:id="_VeYO8DLbEd2HYNz2hI9A2g" general="_XpH50BG1Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_uMsqABKdEdymP89M8JXkzA" name="throughput" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A0ymgBKeEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A0o1gBKeEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A0ymgBKeEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_A07wcBKeEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_uH8F0BKdEdymP89M8JXkzA" name="utilization" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-h7zEBKdEdymP89M8JXkzA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-hyCEBKdEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-h7zEBKdEdymP89M8JXkzA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-iE9ABKdEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
@@ -13215,16 +13215,16 @@
<generalization xmi:id="_ODI3IBKeEdymP89M8JXkzA" general="_1zYucBG0Edyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_Est6UBKeEdymP89M8JXkzA" name="packetSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5LrMcBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J4VDkBKeEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J4L5oBKeEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J4VDkBKeEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_J4e0kBKeEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ExxZcBKeEdymP89M8JXkzA" name="utilization" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L2-hkBKeEdymP89M8JXkzA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L20wkBKeEdymP89M8JXkzA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L2-hkBKeEdymP89M8JXkzA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_L3HrgBKeEdymP89M8JXkzA">
<value xsi:nil="true"/>
</defaultValue>
@@ -13232,15 +13232,15 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_xoNcsBKfEdyaWJN1BYon3A" name="GaWorkloadBehavior">
<ownedAttribute xmi:id="_z-pIkBKfEdyaWJN1BYon3A" name="behavior" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_27UVEBKfEdyaWJN1BYon3A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_27KkEBKfEdyaWJN1BYon3A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_27UVEBKfEdyaWJN1BYon3A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_27dfABKfEdyaWJN1BYon3A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_0Eyz4BKfEdyaWJN1BYon3A" name="demand" visibility="public" type="_CGyBkBKYEdyGYuetzx6T5A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5OSdQBKfEdyaWJN1BYon3A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5OJTUBKfEdyaWJN1BYon3A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5OSdQBKfEdyaWJN1BYon3A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5OSdQRKfEdyaWJN1BYon3A">
<value xsi:nil="true"/>
</defaultValue>
@@ -13257,22 +13257,22 @@
<generalization xmi:id="_WHuOoEIhEd6dmI2dd6jVFQ" general="_H0HcsECNEd6UTJZnztgOLw"/>
<ownedAttribute xmi:id="__J45ABKfEdyaWJN1BYon3A" name="context" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_B5VngBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C7NOgBKgEdyaWJN1BYon3A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C7DdgBKgEdyaWJN1BYon3A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C7NOgBKgEdyaWJN1BYon3A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_C7WYcBKgEdyaWJN1BYon3A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="__M5JsBKfEdyaWJN1BYon3A" name="workload" visibility="public" type="_xoNcsBKfEdyaWJN1BYon3A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GXK_EBKgEdyaWJN1BYon3A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GXBOEBKgEdyaWJN1BYon3A" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GXK_EBKgEdyaWJN1BYon3A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GXUwEBKgEdyaWJN1BYon3A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="__PvCUBKfEdyaWJN1BYon3A" name="platform" visibility="public" type="_JSAYgBKgEdyaWJN1BYon3A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IzhFsBKgEdyaWJN1BYon3A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IzXUsBKgEdyaWJN1BYon3A" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IzhFsBKgEdyaWJN1BYon3A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_IzhFsRKgEdyaWJN1BYon3A">
<value xsi:nil="true"/>
</defaultValue>
@@ -13280,8 +13280,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_JSAYgBKgEdyaWJN1BYon3A" name="GaResourcesPlatform">
<ownedAttribute xmi:id="_LSGoABKgEdyaWJN1BYon3A" name="resources" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NgtNkBKgEdyaWJN1BYon3A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NgjckBKgEdyaWJN1BYon3A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NgtNkBKgEdyaWJN1BYon3A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NgtNkRKgEdyaWJN1BYon3A">
<value xsi:nil="true"/>
</defaultValue>
@@ -13467,7 +13467,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-YBqrG3Ed-tmN4hwNCxXQ" name="end2EndD" ordered="false" upperBound="-1" eType="_g41H0LG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-YBrLG3Ed-tmN4hwNCxXQ" name="timing" unique="false" upperBound="-1" eType="_b-O3XrG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-YBrrG3Ed-tmN4hwNCxXQ" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-YBsLG3Ed-tmN4hwNCxXQ" name="SaCommStep" eSuperTypes="_b-O3fbG3Ed-tmN4hwNCxXQ">
@@ -13476,13 +13476,13 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-YBtLG3Ed-tmN4hwNCxXQ" name="spareCap" ordered="false" unique="false" eType="_g41H0LG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-YBtrG3Ed-tmN4hwNCxXQ" name="schSlack" ordered="false" unique="false" eType="_g4r94LG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-YBuLG3Ed-tmN4hwNCxXQ" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-YBvrG3Ed-tmN4hwNCxXQ" name="SaStep" eSuperTypes="_b-O22bG3Ed-tmN4hwNCxXQ">
<eAnnotations xmi:id="_b-YBv7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_W2mUABKiEdyxBYjIJwIrZA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-YBwLG3Ed-tmN4hwNCxXQ" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-YBwrG3Ed-tmN4hwNCxXQ" name="deadline" ordered="false" unique="false" eType="_g41H0LG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-YBxLG3Ed-tmN4hwNCxXQ" name="spareCap" ordered="false" unique="false" eType="_g41H0LG3Ed-tmN4hwNCxXQ"/>
@@ -13804,7 +13804,7 @@
<eAnnotations xmi:id="_4DUv95i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_V4UjUBKhEdyxBYjIJwIrZA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4DUwAJi4Ed-m0Oaexd_lJA" name="timing" unique="false" upperBound="-1" eType="_329uoZi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4DUwApi4Ed-m0Oaexd_lJA" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="__fkcUJi4Ed-m0Oaexd_lJA" name="isSched" ordered="false" unique="false" eType="__eEng5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="__gUDMJi4Ed-m0Oaexd_lJA" name="schSlack" ordered="false" unique="false" eType="__gUDMpi4Ed-m0Oaexd_lJA"/>
@@ -13814,7 +13814,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4DUwBJi4Ed-m0Oaexd_lJA" name="SaCommStep" eSuperTypes="_329uwJi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_4DUwBZi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_KVOeIBKiEdyxBYjIJwIrZA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4DUwDJi4Ed-m0Oaexd_lJA" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="__lYJYJi4Ed-m0Oaexd_lJA" name="deadline" ordered="false" unique="false" eType="__hDqEpi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="__mRhQJi4Ed-m0Oaexd_lJA" name="spareCap" ordered="false" unique="false" eType="__hDqEpi4Ed-m0Oaexd_lJA"/>
@@ -13823,7 +13823,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4DUwEpi4Ed-m0Oaexd_lJA" name="SaStep" eSuperTypes="_329t75i4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_4DUwE5i4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_W2mUABKiEdyxBYjIJwIrZA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4DUwFJi4Ed-m0Oaexd_lJA" name="base_BehavioralFeature" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//BehavioralFeature"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4DUwIpi4Ed-m0Oaexd_lJA" name="sharedRes" ordered="false" unique="false" upperBound="-1" eType="_4DUwKZi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="__yfYUJi4Ed-m0Oaexd_lJA" name="deadline" ordered="false" unique="false" eType="__hDqEpi4Ed-m0Oaexd_lJA"/>
@@ -13959,15 +13959,15 @@
<generalization xmi:id="_SqmDEBKhEdyxBYjIJwIrZA" general="_9gc2ABKfEdyaWJN1BYon3A"/>
<ownedAttribute xmi:id="_Kthe0BKhEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NkjWUBKhEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NkZlUBKhEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NkjWUBKhEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NktHUBKhEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_K4bHQBKhEdyxBYjIJwIrZA" name="optCriterion" visibility="public" type="__N1IYBKgEdyxBYjIJwIrZA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P3TcEBKhEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_P3JrEBKhEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_P3TcEBKhEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_P3dNEBKhEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
@@ -13976,39 +13976,39 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_V4UjUBKhEdyxBYjIJwIrZA" name="SaEndtoEndFlow">
<ownedAttribute xmi:id="_Xpx54BKhEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cv-XoBKhEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cv0moBKhEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cv-XoBKhEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cwHhkBKhEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_X131IBKhEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fLFIIBKhEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fK7-MBKhEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fLFIIBKhEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_fLO5IBKhEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_X5mekBKhEdyxBYjIJwIrZA" name="end2EndT" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hfbJUBKhEdyxBYjIJwIrZA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hfR_YBKhEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hfbJUBKhEdyxBYjIJwIrZA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_hfk6UBKhEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_X9e5ABKhEdyxBYjIJwIrZA" name="end2EndD" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jfBCgBKhEdyxBYjIJwIrZA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_je3RgBKhEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jfBCgBKhEdyxBYjIJwIrZA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jfKMcBKhEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_YBhEcBKhEdyxBYjIJwIrZA" name="timing" visibility="public" type="_En1FMBKcEdymP89M8JXkzA" isOrdered="true" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r9u7QBKhEdyxBYjIJwIrZA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r9lxUBKhEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r9u7QBKhEdyxBYjIJwIrZA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_o6ZtIBKhEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
@@ -14024,24 +14024,24 @@
<generalization xmi:id="_VmeI4BKiEdyxBYjIJwIrZA" general="_riBT0BKaEdyGYuetzx6T5A"/>
<ownedAttribute xmi:id="_L0R2EBKiEdyxBYjIJwIrZA" name="deadline" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_POtVkBKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_POkLoBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_POtVkBKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_PO3GkBKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_L4AfgBKiEdyxBYjIJwIrZA" name="spareCap" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Rcc_gBKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RcTOgBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Rcc_gBKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RcmwgBKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_L7cOABKiEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TXr9IBKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TXZCMBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TXr9IBKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TX1uIBKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
@@ -14060,71 +14060,71 @@
</ownedAttribute>
<ownedAttribute xmi:id="_bFPesBKiEdyxBYjIJwIrZA" name="deadline" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fs9QsRKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fs9QsBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fs9QsRKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ftHBsBKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_bJa0EBKiEdyxBYjIJwIrZA" name="spareCap" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hwP-IBKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hwG0MBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hwP-IBKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_hwZvIBKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_bNJdgBKiEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jyWYwRKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jyWYwBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jyWYwRKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jygJwBKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_bRB38BKiEdyxBYjIJwIrZA" name="preemptT" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lzaRkBKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lzQgkBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lzaRkBKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_lzkCkBKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_bU6SYBKiEdyxBYjIJwIrZA" name="readyT" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oH3ngRKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oH3ngBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oH3ngRKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_oIAxcBKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_bYo70BKiEdyxBYjIJwIrZA" name="nonpreemptionBlocking" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q5jsABKiEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q5aiEBKiEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q5jsABKiEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_q5tdABKiEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_89iBcDL9Ed2-hZkEerSQAg" name="sharedRes" visibility="public" type="_eEgPsBKjEdyxBYjIJwIrZA" isUnique="false" redefinedProperty="_nUkswBG6Edyb1KzJ7GkiGA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JrI8gDL-Ed2-hZkEerSQAg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Jq_LgDL-Ed2-hZkEerSQAg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JrI8gDL-Ed2-hZkEerSQAg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_JrSGcDL-Ed2-hZkEerSQAg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_7seFYDMBEd2-hZkEerSQAg" name="selfSuspensionBlocking" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7seFYTMBEd2-hZkEerSQAg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7seFYjMBEd2-hZkEerSQAg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7seFYTMBEd2-hZkEerSQAg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_7seFYzMBEd2-hZkEerSQAg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="__54hADMBEd2-hZkEerSQAg" name="numberSelfSuspensions" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EEKwIDMCEd2-hZkEerSQAg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EEA_IDMCEd2-hZkEerSQAg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EEKwIDMCEd2-hZkEerSQAg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_EEdrEDMCEd2-hZkEerSQAg">
<value xsi:nil="true"/>
</defaultValue>
@@ -14137,24 +14137,24 @@
<generalization xmi:id="_-Nzj4BKiEdyxBYjIJwIrZA" general="_En1FMBKcEdymP89M8JXkzA"/>
<ownedAttribute xmi:id="_-3R-sBKiEdyxBYjIJwIrZA" name="suspentions" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ch9gsRKjEdyxBYjIJwIrZA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ch9gsBKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ch9gsRKjEdyxBYjIJwIrZA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_CiHRsBKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_-50VUBKiEdyxBYjIJwIrZA" name="blockT" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EsamEBKjEdyxBYjIJwIrZA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EsQ1EBKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EsamEBKjEdyxBYjIJwIrZA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_EsjwABKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_-89I4BKiEdyxBYjIJwIrZA" name="overlaps" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4p0IBKjEdyxBYjIJwIrZA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G4gDIBKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4p0IBKjEdyxBYjIJwIrZA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_G4y-EBKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
@@ -14164,40 +14164,40 @@
<generalization xmi:id="_uIkJMBKjEdyxBYjIJwIrZA" general="_y3mvQBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_fz80EBKjEdyxBYjIJwIrZA" name="capacity" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kVrS0BKjEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kViI4BKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kVrS0BKjEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kV1D0BKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_f43wUBKjEdyxBYjIJwIrZA" name="isPreemp" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mNLnARKjEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mNLnABKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mNLnARKjEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_mNUw8BKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_f72y4BKjEdyxBYjIJwIrZA" name="isConsum" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oooVwBKjEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oofL0BKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oooVwBKjEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ooyGwBKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_gAVDMBKjEdyxBYjIJwIrZA" name="acquisT" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rF4bUBKjEdyxBYjIJwIrZA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rFuqUBKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rF4bUBKjEdyxBYjIJwIrZA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_rGBlQBKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_gEDsoBKjEdyxBYjIJwIrZA" name="releaseT" visibility="public">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s61x0BKjEdyxBYjIJwIrZA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s6sA0BKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s61x0BKjEdyxBYjIJwIrZA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_s6_i0BKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
@@ -14207,16 +14207,16 @@
<generalization xmi:id="_4ckvoBKjEdyxBYjIJwIrZA" general="_sEF-wBKdEdymP89M8JXkzA"/>
<ownedAttribute xmi:id="_wLaKsBKjEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yyC1wBKjEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yx5r0BKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yyC1wBKjEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_yyMmwBKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_wOPcQBKjEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3C6OABKjEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3CxEEBKjEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3C6OABKjEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_3DD_ABKjEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
@@ -14226,40 +14226,40 @@
<generalization xmi:id="_VnqJwBKkEdyxBYjIJwIrZA" general="_MDZCYBKdEdymP89M8JXkzA"/>
<ownedAttribute xmi:id="_8Q8ZIBKjEdyxBYjIJwIrZA" name="isSched" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BV4SoBKkEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BVuhoBKkEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BV4SoBKkEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_BWBckBKkEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8Uh4oBKjEdyxBYjIJwIrZA" name="schSlack" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DT8h0BKkEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DTyw0BKkEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DT8h0BKkEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_DUFrwBKkEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8Xz2IBKjEdyxBYjIJwIrZA" name="schedUtiliz" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fxe7QRKkEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Fxe7QBKkEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fxe7QRKkEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FxosQBKkEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8bifkBKjEdyxBYjIJwIrZA" name="ISRswitchT" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_kMwX8BFREdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Iazt8BKkEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IagzABKkEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Iazt8BKkEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Ia9e8BKkEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_8gAv4BKjEdyxBYjIJwIrZA" name="ISRprioRange" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_ehpdoBEBEdyx6M3BlUjlCQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M7V54BKkEdyxBYjIJwIrZA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_M7C-8BKkEdyxBYjIJwIrZA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M7V54BKkEdyxBYjIJwIrZA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_M7V54RKkEdyxBYjIJwIrZA">
<value xsi:nil="true"/>
</defaultValue>
@@ -14445,7 +14445,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-hyoLG3Ed-tmN4hwNCxXQ" name="utilization" ordered="false" unique="false" eType="_hgm5gLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-hyorG3Ed-tmN4hwNCxXQ" name="throughput" ordered="false" unique="false" eType="_hhDlcLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-hypLG3Ed-tmN4hwNCxXQ" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_heq_0LG3Ed-tmN4hwNCxXQ" name="NFP_Duration" instanceClassName="java.lang.String">
@@ -14712,7 +14712,7 @@
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4Qb-3Zi4Ed-m0Oaexd_lJA" name="instance" ordered="false" unique="false" eType="_0-x--5i4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4Qb-35i4Ed-m0Oaexd_lJA" name="host" ordered="false" unique="false" eType="_329uhJi4Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4Qb-5Zi4Ed-m0Oaexd_lJA" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BdCOkJi5Ed-m0Oaexd_lJA" name="poolSize" ordered="false" unique="false" eType="_AzBBMJi5Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BehcUJi5Ed-m0Oaexd_lJA" name="utilization" ordered="false" unique="false" eType="_AqhMgpi5Ed-m0Oaexd_lJA"/>
@@ -14776,35 +14776,35 @@
<generalization xmi:id="_l_878BKmEdyghqIjFIG1tQ" general="_eXMtwBKZEdyGYuetzx6T5A"/>
<ownedAttribute xmi:id="_IV2qkBKmEdyghqIjFIG1tQ" name="noSync" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_55fyMBFGEdyBd9q9NMDXUQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nozx8BKmEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NoqA8BKmEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nozx8BKmEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_No9i8BKmEdyghqIjFIG1tQ" value="false"/>
</ownedAttribute>
<ownedAttribute xmi:id="_IZ42ABKmEdyghqIjFIG1tQ" name="extOpDemand" visibility="public" isOrdered="true">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_qZ3GUAnxEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WLbTQBKmEdyghqIjFIG1tQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WLRiQBKmEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WLbTQBKmEdyghqIjFIG1tQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RiGXsBKmEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_In6D4BKmEdyghqIjFIG1tQ" name="extOpCount" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VBIqYBKmEdyghqIjFIG1tQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VA-5YBKmEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VBIqYBKmEdyghqIjFIG1tQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_VBR0UBKmEdyghqIjFIG1tQ" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_Isr2MBKmEdyghqIjFIG1tQ" name="behavDemand" visibility="public" type="_XYaMIBKYEdyGYuetzx6T5A" isOrdered="true">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_elsJ0BKmEdyghqIjFIG1tQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_elZO4BKmEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_elsJ0BKmEdyghqIjFIG1tQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_el160BKmEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_IwafoBKmEdyghqIjFIG1tQ" name="behavCount" visibility="public" isOrdered="true">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jy-HABKmEdyghqIjFIG1tQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jy09EBKmEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jy-HABKmEdyghqIjFIG1tQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jzH4ABKmEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -14821,16 +14821,16 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="__s4NIBKmEdyghqIjFIG1tQ" name="PaResPassStep">
<generalization xmi:id="_hGkVsBKnEdyghqIjFIG1tQ" general="_eXMtwBKZEdyGYuetzx6T5A"/>
<ownedAttribute xmi:id="_CG1uIBKnEdyghqIjFIG1tQ" name="resource" visibility="public" type="_BthQEBGzEdyb1KzJ7GkiGA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fsu2wBKnEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Fsls0BKnEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fsu2wBKnEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Fs4nwBKnEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_CJh1wBKnEdyghqIjFIG1tQ" name="resUnits" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JfwccBKnEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JfdhgBKnEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JfwccBKnEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Jf6NcBKnEdyghqIjFIG1tQ" value="1"/>
</ownedAttribute>
</packagedElement>
@@ -14838,24 +14838,24 @@
<generalization xmi:id="_g_4pcBKoEdyghqIjFIG1tQ" general="_BthQEBGzEdyb1KzJ7GkiGA"/>
<ownedAttribute xmi:id="_XkSRsBKoEdyghqIjFIG1tQ" name="utilization" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bUQjYBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bUHZcBKoEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bUQjYBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bUZtUBKoEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_XtzaEBKoEdyghqIjFIG1tQ" name="throughput" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eNJcEBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eNASIBKoEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eNJcEBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_eNSmABKoEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_XxUoIBKoEdyghqIjFIG1tQ" name="poolSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fuItsBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ft-8sBKoEdyghqIjFIG1tQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fuItsBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_fuItsRKoEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -14864,44 +14864,44 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_kG1zUBKoEdyghqIjFIG1tQ" name="PaRunTInstance">
<ownedAttribute xmi:id="_ls81gBKoEdyghqIjFIG1tQ" name="poolSize" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_0KWSgBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rJogoBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rJfWsBKoEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rJogoBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_rJyRoBKoEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_lwU5oBKoEdyghqIjFIG1tQ" name="unbddPool" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uU_CUBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uU14YBKoEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uU_CUBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_uVIMQBKoEdyghqIjFIG1tQ" value="false"/>
</ownedAttribute>
<ownedAttribute xmi:id="_l4q9UBKoEdyghqIjFIG1tQ" name="instance" visibility="public" type="_1zYucBG0Edyb1KzJ7GkiGA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wyCTkBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wxv_sBKoEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wyCTkBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_wyMEkBKoEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_mGJ_sBKoEdyghqIjFIG1tQ" name="host" visibility="public" type="_MDZCYBKdEdymP89M8JXkzA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yWr9MBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yWizQBKoEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yWr9MBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_yW1HIBKoEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_mJYS0BKoEdyghqIjFIG1tQ" name="utilization" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_Yq-MQBFQEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0BWIMBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0BMXMBKoEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0BWIMBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_0BWIMRKoEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_mMc08BKoEdyghqIjFIG1tQ" name="throughput" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_UDZSQBFSEdyUJeMeN__D-A"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1vqrMBKoEdyghqIjFIG1tQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1vg6MBKoEdyghqIjFIG1tQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1vqrMBKoEdyghqIjFIG1tQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_1vz1IBKoEdyghqIjFIG1tQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -14929,7 +14929,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-hyqLG3Ed-tmN4hwNCxXQ" name="LinkTopology" abstract="true">
<eAnnotations xmi:id="_b-hyqbG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xKpbwBmWEdyKYph7niDrbQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-hyqrG3Ed-tmN4hwNCxXQ" name="base_Connector" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Connector"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Connector"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-hyrLG3Ed-tmN4hwNCxXQ" name="DefaultLink" eSuperTypes="_b-hyqLG3Ed-tmN4hwNCxXQ">
@@ -14996,7 +14996,7 @@
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-hy-rG3Ed-tmN4hwNCxXQ" name="fitting" ordered="false" unique="false" eType="_iIFJMLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-hy_LG3Ed-tmN4hwNCxXQ" name="tiler" ordered="false" unique="false" eType="_iGTAgLG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-hy_rG3Ed-tmN4hwNCxXQ" name="base_ConnectorEnd" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ConnectorEnd"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ConnectorEnd"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_b-hzAbG3Ed-tmN4hwNCxXQ" name="MARTE_Library_MARTE_DataTypes_IntegerMatrix" instanceClassName="java.lang.String">
@@ -15008,7 +15008,7 @@
<eAnnotations xmi:id="_b-hzBLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_iPxlMGqmEdyHVMM3AaZxvA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-hzBbG3Ed-tmN4hwNCxXQ" name="shape" ordered="false" unique="false" lowerBound="1" eType="_iFsjkbG3Ed-tmN4hwNCxXQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-hzB7G3Ed-tmN4hwNCxXQ" name="base_MultiplicityElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//MultiplicityElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EDataType" xmi:id="_iFGtsLG3Ed-tmN4hwNCxXQ" name="IntegerVector" instanceClassName="java.lang.String">
@@ -15048,7 +15048,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4UdggZi4Ed-m0Oaexd_lJA" name="LinkTopology" abstract="true">
<eAnnotations xmi:id="_4Udggpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xKpbwBmWEdyKYph7niDrbQ"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4Udgg5i4Ed-m0Oaexd_lJA" name="base_Connector" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Connector"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Connector"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4UdghZi4Ed-m0Oaexd_lJA" name="DefaultLink" eSuperTypes="_4UdggZi4Ed-m0Oaexd_lJA">
@@ -15106,7 +15106,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4Udg55i4Ed-m0Oaexd_lJA" name="Tiler" eSuperTypes="_4UdggZi4Ed-m0Oaexd_lJA">
<eAnnotations xmi:id="_4Udg6Ji4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXdCkBmpEdy7eNTGSxTSvg"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4Udg8Zi4Ed-m0Oaexd_lJA" name="base_ConnectorEnd" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ConnectorEnd"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ConnectorEnd"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BtH5AJi5Ed-m0Oaexd_lJA" name="origin" ordered="false" unique="false" eType="_Bi_sopi5Ed-m0Oaexd_lJA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BuUL0Ji5Ed-m0Oaexd_lJA" name="paving" ordered="false" unique="false" eType="_BuUL0pi5Ed-m0Oaexd_lJA"/>
@@ -15116,7 +15116,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4Udg9Ji4Ed-m0Oaexd_lJA" name="Shaped">
<eAnnotations xmi:id="_4Udg9Zi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_iPxlMGqmEdyHVMM3AaZxvA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4Udg-Ji4Ed-m0Oaexd_lJA" name="base_MultiplicityElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//MultiplicityElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//MultiplicityElement"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_BzYSAJi5Ed-m0Oaexd_lJA" name="shape" ordered="false" unique="false" lowerBound="1" eType="_BkorYpi5Ed-m0Oaexd_lJA"/>
</eClassifiers>
@@ -15172,16 +15172,16 @@
<generalization xmi:id="_LBEnMBmXEdyKYph7niDrbQ" general="_xKpbwBmWEdyKYph7niDrbQ"/>
<ownedAttribute xmi:id="_-kaSMBmWEdyKYph7niDrbQ" name="repetitionShapeDependence" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_WkRCQBD_EdyybZnLxHsjyA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CSwMMRmXEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CSwMMBmXEdyKYph7niDrbQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CSwMMRmXEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_CS5WIBmXEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_-mMa4BmWEdyKYph7niDrbQ" name="isModulo" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="MARTE_Library.library.uml#_Ddte8AnqEdy9WM11hWri2g"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GE95kBmXEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GEq-oBmXEdyKYph7niDrbQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GE95kBmXEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GFHqkBmXEdyKYph7niDrbQ" value="false"/>
</ownedAttribute>
</packagedElement>
@@ -15189,32 +15189,32 @@
<generalization xmi:id="_7xJOcBmYEdyKYph7niDrbQ" general="_kzoXABHbEdyWC5IKDhzksw"/>
<ownedAttribute xmi:id="_srPmUBmYEdyKYph7niDrbQ" name="patternShape" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vq2LARmYEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vq2LABmYEdyKYph7niDrbQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vq2LARmYEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_vq_U8BmYEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_s3ddYBmYEdyKYph7niDrbQ" name="repetitionSpace" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yI6v8BmYEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yIxmABmYEdyKYph7niDrbQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yI6v8BmYEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_yJEg8BmYEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_s7x8sBmYEdyKYph7niDrbQ" name="fromTiler" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_hwFnsBmVEdyKYph7niDrbQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0pOwkRmYEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0pOwkBmYEdyKYph7niDrbQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0pOwkRmYEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_0pYhkBmYEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_tLbiQBmYEdyKYph7niDrbQ" name="toTiler" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_hwFnsBmVEdyKYph7niDrbQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2vLJYRmYEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2vLJYBmYEdyKYph7niDrbQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2vLJYRmYEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_2vU6YBmYEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -15224,16 +15224,16 @@
<generalization xmi:id="_6058wBmlEdyHOO9ydeHscA" general="_xKpbwBmWEdyKYph7niDrbQ"/>
<ownedAttribute xmi:id="_zbffMBmlEdyHOO9ydeHscA" name="patternShape" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1vtkkRmlEdyHOO9ydeHscA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1vtkkBmlEdyHOO9ydeHscA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1vtkkRmlEdyHOO9ydeHscA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_1vtkkhmlEdyHOO9ydeHscA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_zfqNgBmlEdyHOO9ydeHscA" name="repetitonShape" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4JJhIRmlEdyHOO9ydeHscA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4JJhIBmlEdyHOO9ydeHscA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4JJhIRmlEdyHOO9ydeHscA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_4JJhIhmlEdyHOO9ydeHscA">
<value xsi:nil="true"/>
</defaultValue>
@@ -15243,32 +15243,32 @@
<generalization xmi:id="_l0hWYBmpEdy7eNTGSxTSvg" general="_xKpbwBmWEdyKYph7niDrbQ"/>
<ownedAttribute xmi:id="_VJzskBmpEdy7eNTGSxTSvg" name="origin" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_WkRCQBD_EdyybZnLxHsjyA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YdWg8BmpEdy7eNTGSxTSvg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YdMv8BmpEdy7eNTGSxTSvg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YdWg8BmpEdy7eNTGSxTSvg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Ydfq4BmpEdy7eNTGSxTSvg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_VSJJMBmpEdy7eNTGSxTSvg" name="paving" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_yhmP0BD_EdyybZnLxHsjyA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bCG8sBmpEdy7eNTGSxTSvg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bB9ywBmpEdy7eNTGSxTSvg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bCG8sBmpEdy7eNTGSxTSvg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bCQtsBmpEdy7eNTGSxTSvg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_VUrf0BmpEdy7eNTGSxTSvg" name="fitting" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_yhmP0BD_EdyybZnLxHsjyA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dzwk8BmpEdy7eNTGSxTSvg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dznbABmpEdy7eNTGSxTSvg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dzwk8BmpEdy7eNTGSxTSvg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_dz6V8BmpEdy7eNTGSxTSvg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_PhZLMBmsEdy7eNTGSxTSvg" name="tiler" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_hwFnsBmVEdyKYph7niDrbQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RUSsMBmsEdy7eNTGSxTSvg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RUJiQBmsEdy7eNTGSxTSvg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RUSsMBmsEdy7eNTGSxTSvg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RUcdMBmsEdy7eNTGSxTSvg">
<value xsi:nil="true"/>
</defaultValue>
@@ -15280,8 +15280,8 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_iPxlMGqmEdyHVMM3AaZxvA" name="Shaped">
<ownedAttribute xmi:id="_jWnRcGqmEdyHVMM3AaZxvA" name="shape" visibility="public" isUnique="false">
<type xmi:type="uml:DataType" href="MARTE_Library.library.uml#_5jgZkBmVEdyKYph7niDrbQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k_svIGqmEdyHVMM3AaZxvA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k_qS4GqmEdyHVMM3AaZxvA" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k_svIGqmEdyHVMM3AaZxvA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_k_vLYGqmEdyHVMM3AaZxvA">
<value xsi:nil="true"/>
</defaultValue>
@@ -15331,7 +15331,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-riBLG3Ed-tmN4hwNCxXQ" name="BoundedSubtype">
<eAnnotations xmi:id="_b-riBbG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_HYVowA-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riBrG3Ed-tmN4hwNCxXQ" name="baseType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-riCLG3Ed-tmN4hwNCxXQ" name="minValue" ordered="false" unique="false" lowerBound="1">
<eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -15346,46 +15346,46 @@
<eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riELG3Ed-tmN4hwNCxXQ" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-riErG3Ed-tmN4hwNCxXQ" name="IntervalType">
<eAnnotations xmi:id="_b-riE7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_HvlrIA-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riFLG3Ed-tmN4hwNCxXQ" name="intervalAttrib" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riFrG3Ed-tmN4hwNCxXQ" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-riGLG3Ed-tmN4hwNCxXQ" name="CollectionType">
<eAnnotations xmi:id="_b-riGbG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_IFV4sA-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riGrG3Ed-tmN4hwNCxXQ" name="collectionAttrib" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riHLG3Ed-tmN4hwNCxXQ" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-riHrG3Ed-tmN4hwNCxXQ" name="TupleType">
<eAnnotations xmi:id="_b-riH7G3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_IkLw0A-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riILG3Ed-tmN4hwNCxXQ" name="tupleAttrib" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riIrG3Ed-tmN4hwNCxXQ" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-riJLG3Ed-tmN4hwNCxXQ" name="ChoiceType">
<eAnnotations xmi:id="_b-riJbG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_I0uHMA-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riJrG3Ed-tmN4hwNCxXQ" name="choiceAttrib" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riKLG3Ed-tmN4hwNCxXQ" name="defaultAttrib" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riKrG3Ed-tmN4hwNCxXQ" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
@@ -15400,7 +15400,7 @@
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4UxCgZi4Ed-m0Oaexd_lJA" name="BoundedSubtype">
<eAnnotations xmi:id="_4UxCgpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_HYVowA-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCg5i4Ed-m0Oaexd_lJA" name="baseType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4UxChZi4Ed-m0Oaexd_lJA" name="minValue" ordered="false" unique="false" lowerBound="1">
<eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -15415,46 +15415,46 @@
<eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCjZi4Ed-m0Oaexd_lJA" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4UxCj5i4Ed-m0Oaexd_lJA" name="IntervalType">
<eAnnotations xmi:id="_4UxCkJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_HvlrIA-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCkZi4Ed-m0Oaexd_lJA" name="intervalAttrib" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCk5i4Ed-m0Oaexd_lJA" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4UxClZi4Ed-m0Oaexd_lJA" name="CollectionType">
<eAnnotations xmi:id="_4UxClpi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_IFV4sA-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCl5i4Ed-m0Oaexd_lJA" name="collectionAttrib" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCmZi4Ed-m0Oaexd_lJA" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4UxCm5i4Ed-m0Oaexd_lJA" name="TupleType">
<eAnnotations xmi:id="_4UxCnJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_IkLw0A-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCnZi4Ed-m0Oaexd_lJA" name="tupleAttrib" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCn5i4Ed-m0Oaexd_lJA" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4UxCoZi4Ed-m0Oaexd_lJA" name="ChoiceType">
<eAnnotations xmi:id="_4UxCopi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_I0uHMA-NEdyLh7muGbCqMw"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCo5i4Ed-m0Oaexd_lJA" name="choiceAttrib" ordered="false" unique="false" upperBound="-1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCpZi4Ed-m0Oaexd_lJA" name="defaultAttrib" ordered="false" unique="false">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCp5i4Ed-m0Oaexd_lJA" name="base_DataType" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//DataType"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
@@ -15462,40 +15462,40 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_HYVowA-NEdyLh7muGbCqMw" name="BoundedSubtype">
<ownedAttribute xmi:id="_OrmbAA-NEdyLh7muGbCqMw" name="baseType" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RF-LsQ-NEdyLh7muGbCqMw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RF-LsA-NEdyLh7muGbCqMw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RF-LsQ-NEdyLh7muGbCqMw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RF-Lsg-NEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_SpzV8A-NEdyLh7muGbCqMw" name="minValue" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2JhhcA-OEdyLh7muGbCqMw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2JYXgA-OEdyLh7muGbCqMw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2JhhcA-OEdyLh7muGbCqMw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sswsEA-OEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_vCnJIA-OEdyLh7muGbCqMw" name="maxValue" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2-HAEA-OEdyLh7muGbCqMw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_299PEA-OEdyLh7muGbCqMw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2-HAEA-OEdyLh7muGbCqMw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_vCnJIw-OEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_3UdDgA-OEdyLh7muGbCqMw" name="isMinOpen" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6FQ-QQ-OEdyLh7muGbCqMw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6FQ-QA-OEdyLh7muGbCqMw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6FQ-QQ-OEdyLh7muGbCqMw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6FQ-Qg-OEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_7kTIEA-OEdyLh7muGbCqMw" name="isMaxOpen" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9YMHkA-OEdyLh7muGbCqMw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9YCWkA-OEdyLh7muGbCqMw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9YMHkA-OEdyLh7muGbCqMw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_9YMHkQ-OEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
@@ -15507,8 +15507,8 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_HvlrIA-NEdyLh7muGbCqMw" name="IntervalType">
<ownedAttribute xmi:id="_DTvgAA-PEdyLh7muGbCqMw" name="intervalAttrib" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H_BjYA-PEdyLh7muGbCqMw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H-4ZcA-PEdyLh7muGbCqMw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H_BjYA-PEdyLh7muGbCqMw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_H_BjYQ-PEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
@@ -15520,8 +15520,8 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_IFV4sA-NEdyLh7muGbCqMw" name="CollectionType">
<ownedAttribute xmi:id="_Sj86sA-PEdyLh7muGbCqMw" name="collectionAttrib" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Sj86sQ-PEdyLh7muGbCqMw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sj86sg-PEdyLh7muGbCqMw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Sj86sQ-PEdyLh7muGbCqMw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Sj86sw-PEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
@@ -15533,8 +15533,8 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_IkLw0A-NEdyLh7muGbCqMw" name="TupleType">
<ownedAttribute xmi:id="_Xy1aYA-PEdyLh7muGbCqMw" name="tupleAttrib" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aSO1AQ-PEdyLh7muGbCqMw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aSO1AA-PEdyLh7muGbCqMw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aSO1AQ-PEdyLh7muGbCqMw" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Xy1aYw-PEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
@@ -15546,16 +15546,16 @@
<packagedElement xmi:type="uml:Stereotype" xmi:id="_I0uHMA-NEdyLh7muGbCqMw" name="ChoiceType">
<ownedAttribute xmi:id="_dFJokA-PEdyLh7muGbCqMw" name="choiceAttrib" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fellIQ-PEdyLh7muGbCqMw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fellIA-PEdyLh7muGbCqMw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fellIQ-PEdyLh7muGbCqMw" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_dFJokw-PEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_drugYA-PEdyLh7muGbCqMw" name="defaultAttrib" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iMumYQ-PEdyLh7muGbCqMw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iMumYA-PEdyLh7muGbCqMw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iMumYQ-PEdyLh7muGbCqMw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_drugYw-PEdyLh7muGbCqMw">
<value xsi:nil="true"/>
</defaultValue>
@@ -15600,13 +15600,13 @@
<eAnnotations xmi:id="_b-riNLG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_7-_5QBBNEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_b-riNbG3Ed-tmN4hwNCxXQ" name="dir" ordered="false" unique="false" eType="_b-riLrG3Ed-tmN4hwNCxXQ" defaultValueLiteral="inout"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riN7G3Ed-tmN4hwNCxXQ" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_b-riObG3Ed-tmN4hwNCxXQ" name="ExpressionContext">
<eAnnotations xmi:id="_b-riOrG3Ed-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXvlwBBOEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_b-riO7G3Ed-tmN4hwNCxXQ" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
@@ -15628,13 +15628,13 @@
<eAnnotations xmi:id="_4UxCspi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_7-_5QBBNEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4UxCs5i4Ed-m0Oaexd_lJA" name="dir" ordered="false" unique="false" eType="_4UxCrJi4Ed-m0Oaexd_lJA" defaultValueLiteral="inout"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCtZi4Ed-m0Oaexd_lJA" name="base_Property" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xmi:type="ecore:EClass" xmi:id="_4UxCt5i4Ed-m0Oaexd_lJA" name="ExpressionContext">
<eAnnotations xmi:id="_4UxCuJi4Ed-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_UXvlwBBOEdyt6tGzWCpUVA"/>
<eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4UxCuZi4Ed-m0Oaexd_lJA" name="base_NamedElement" ordered="false" unique="false" lowerBound="1">
- <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
</contents>
@@ -15646,8 +15646,8 @@
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_7-_5QBBNEdyt6tGzWCpUVA" name="Var">
<ownedAttribute xmi:id="_9QgkcBBNEdyt6tGzWCpUVA" name="dir" visibility="public" type="_zT7mkBBNEdyt6tGzWCpUVA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bx4d4BBOEdyt6tGzWCpUVA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BxvT8BBOEdyt6tGzWCpUVA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bx4d4BBOEdyt6tGzWCpUVA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Bx4d4RBOEdyt6tGzWCpUVA" value="inout"/>
</ownedAttribute>
<ownedAttribute xmi:id="_NhDawRBOEdyt6tGzWCpUVA" name="base_Property" isUnique="false" association="_Ng5pwBBOEdyt6tGzWCpUVA">
@@ -15687,8 +15687,8 @@
</packagedElement>
</packagedElement>
</packagedElement>
- <packagedElement xmi:type="uml:Dependency" xmi:id="_y9JiUA9dEdy-lroUn0KWEw" name="FromMARTE design modeltoMARTE foundations" supplier="_jG1CQAPKEdy6wIwMc4WDOQ" client="_tADfQAPMEdyuUt-4qHuVvQ"/>
- <packagedElement xmi:type="uml:Dependency" xmi:id="_zyMT8A9dEdy-lroUn0KWEw" name="FromMARTE analysis modeltoMARTE foundations" supplier="_jG1CQAPKEdy6wIwMc4WDOQ" client="_u8y4wAPMEdyuUt-4qHuVvQ"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_y9JiUA9dEdy-lroUn0KWEw" name="FromMARTE design modeltoMARTE foundations" client="_tADfQAPMEdyuUt-4qHuVvQ" supplier="_jG1CQAPKEdy6wIwMc4WDOQ"/>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_zyMT8A9dEdy-lroUn0KWEw" name="FromMARTE analysis modeltoMARTE foundations" client="_u8y4wAPMEdyuUt-4qHuVvQ" supplier="_jG1CQAPKEdy6wIwMc4WDOQ"/>
<profileApplication xmi:id="_eojtYJiUEd-m0Oaexd_lJA">
<eAnnotations xmi:id="_eojtYZiUEd-m0Oaexd_lJA" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.notation b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.notation
index ddd3abfb19d..9efeb94b972 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.notation
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="__n52gLGyEd-tmN4hwNCxXQ" type="PapyrusUMLClassDiagram" name="GRM_BasicTypes" measurementUnit="Pixel">
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="__n52gLGyEd-tmN4hwNCxXQ" type="PapyrusUMLClassDiagram" name="GRM_BasicTypes" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_HS6aYLGzEd-tmN4hwNCxXQ" type="2010" fontHeight="8" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HTELYLGzEd-tmN4hwNCxXQ" source="ShadowFigure">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HTELYbGzEd-tmN4hwNCxXQ" key="ShadowFigure_Value" value="false"/>
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml
index b623ef69f36..5b58dcc758d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/resources/MARTE_Library.library.uml
@@ -1,5 +1,5 @@
<?xml version="1.0" 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:DataTypes="http://www.eclipse.org/papyrus/DataTypes/1" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:NFPs="http://www.eclipse.org/papyrus/NFPs/1" xmlns:Standard="http://www.eclipse.org/uml2/schemas/Standard/1" xmlns:Time="http://www.eclipse.org/papyrus/Time/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/DataTypes/1 http://www.eclipse.org/papyrus/MARTE/1#//DataTypes http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http://www.eclipse.org/papyrus/NFPs/1 http://www.eclipse.org/papyrus/MARTE/1#//NFPs http://www.eclipse.org/papyrus/Time/1 http://www.eclipse.org/papyrus/MARTE/1#//Time">
+<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:DataTypes="http://www.eclipse.org/papyrus/DataTypes/1" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:NFPs="http://www.eclipse.org/papyrus/NFPs/1" xmlns:Time="http://www.eclipse.org/papyrus/Time/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/DataTypes/1 http://www.eclipse.org/papyrus/MARTE/1#//DataTypes http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http://www.eclipse.org/papyrus/NFPs/1 http://www.eclipse.org/papyrus/MARTE/1#//NFPs http://www.eclipse.org/papyrus/Time/1 http://www.eclipse.org/papyrus/MARTE/1#//Time">
<uml:Package xmi:id="_uBlQkA73EdyML4mHwjNDrw" name="MARTE_Library">
<packageImport xmi:id="_uBlQkQ73EdyML4mHwjNDrw">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
@@ -15,15 +15,15 @@
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HJ1zcAnfEdy9WM11hWri2g" name="Integer">
<ownedOperation xmi:id="_KXsPgAnfEdy9WM11hWri2g" name="+">
<ownedParameter xmi:id="_NyydYAnfEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SI4T4AnfEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SIkx4AnfEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SI4T4AnfEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_SJBd0AnfEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_TJXggAnfEdy9WM11hWri2g" name="j" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZDGUAAnfEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZC9KEAnfEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZDGUAAnfEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ZDZ2AAnfEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -31,8 +31,8 @@
</ownedOperation>
<ownedOperation xmi:id="_39qYoAnoEdy9WM11hWri2g" name="-">
<ownedParameter xmi:id="_39qYpQnoEdy9WM11hWri2g" name="j" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_39qYpgnoEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_39qYpwnoEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_39qYpgnoEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_39qYqAnoEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -40,15 +40,15 @@
</ownedOperation>
<ownedOperation xmi:id="_8NJ34AnoEdy9WM11hWri2g" name="*">
<ownedParameter xmi:id="_8NJ34QnoEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8NJ34gnoEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8NJ34wnoEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8NJ34gnoEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8NJ35AnoEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_8NJ35QnoEdy9WM11hWri2g" name="j" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8NJ35gnoEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8NJ35wnoEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8NJ35gnoEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8NJ36AnoEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -56,15 +56,15 @@
</ownedOperation>
<ownedOperation xmi:id="_Bdd68AnpEdy9WM11hWri2g" name="/">
<ownedParameter xmi:id="_Bdd68QnpEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bdd68gnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bdd68wnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bdd68gnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Bdd69AnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_9u2esAnpEdy9WM11hWri2g" name="j" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9u2esQnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9u2esgnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9u2esQnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_9u2eswnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -72,15 +72,15 @@
</ownedOperation>
<ownedOperation xmi:id="_EnrNIAnpEdy9WM11hWri2g" name=">">
<ownedParameter xmi:id="_EnrNIQnpEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EnrNIgnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EnrNIwnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EnrNIgnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_EnrNJAnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_EnrNJQnpEdy9WM11hWri2g" name="j" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EnrNJgnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EnrNJwnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EnrNJgnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_EnrNKAnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -88,15 +88,15 @@
</ownedOperation>
<ownedOperation xmi:id="_HG9TAAnpEdy9WM11hWri2g" name="&lt;">
<ownedParameter xmi:id="_HG9TAQnpEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HG9TAgnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HG9TAwnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HG9TAgnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HG9TBAnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_KUGH8AnqEdy9WM11hWri2g" name="j" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KUGH8QnqEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KUGH8gnqEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KUGH8QnqEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_KUGH8wnqEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -104,15 +104,15 @@
</ownedOperation>
<ownedOperation xmi:id="_HaLxAAnpEdy9WM11hWri2g" name=">=">
<ownedParameter xmi:id="_HaLxAQnpEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HaLxAgnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HaLxAwnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HaLxAgnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HaLxBAnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_MPe2kAnqEdy9WM11hWri2g" name="j" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MPe2kQnqEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MPe2kgnqEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MPe2kQnqEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_MPe2kwnqEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -120,15 +120,15 @@
</ownedOperation>
<ownedOperation xmi:id="_SlucYAnpEdy9WM11hWri2g" name="&lt;=">
<ownedParameter xmi:id="_SlucYQnpEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SlucYgnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SlucYwnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SlucYgnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_SlucZAnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_PIsfYAnqEdy9WM11hWri2g" name="j" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PIsfYQnqEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PIsfYgnqEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PIsfYQnqEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_PIsfYwnqEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -136,15 +136,15 @@
</ownedOperation>
<ownedOperation xmi:id="_WH6wwAnpEdy9WM11hWri2g" name="==">
<ownedParameter xmi:id="_WH6wwQnpEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WH6wwgnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WH6wwwnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WH6wwgnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_WH6wxAnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_R2vaAAnqEdy9WM11hWri2g" name="j" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R2vaAQnqEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R2vaAgnqEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R2vaAQnqEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_R2vaAwnqEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -152,15 +152,15 @@
</ownedOperation>
<ownedOperation xmi:id="_WtxP0AnpEdy9WM11hWri2g" name="&lt;>">
<ownedParameter xmi:id="_WtxP0QnpEdy9WM11hWri2g" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WtxP0gnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WtxP0wnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WtxP0gnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_WtxP1AnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_WtxP1QnpEdy9WM11hWri2g" name="j" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WtxP1gnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WtxP1wnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WtxP1gnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_WtxP2AnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -168,15 +168,15 @@
</ownedOperation>
<ownedOperation xmi:id="_Te_VAA4uEdysTsAUPnp57Q" name="mod">
<ownedParameter xmi:id="_Te_VAQ4uEdysTsAUPnp57Q" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Te_VAg4uEdysTsAUPnp57Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Te_VAw4uEdysTsAUPnp57Q" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Te_VAg4uEdysTsAUPnp57Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Te_VBA4uEdysTsAUPnp57Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_Te_VBQ4uEdysTsAUPnp57Q" name="j" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Te_VBg4uEdysTsAUPnp57Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Te_VBw4uEdysTsAUPnp57Q" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Te_VBg4uEdysTsAUPnp57Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Te_VCA4uEdysTsAUPnp57Q">
<value xsi:nil="true"/>
</defaultValue>
@@ -184,15 +184,15 @@
</ownedOperation>
<ownedOperation xmi:id="_l7nckEBdEd6UTJZnztgOLw" name="^">
<ownedParameter xmi:id="_oCu6EEBdEd6UTJZnztgOLw" name="p" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qoSnEEBdEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qoQK0EBdEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qoSnEEBdEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_qoT1MEBdEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_q4_8kEBdEd6UTJZnztgOLw" name="j" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_48xAAEBiEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_48vx4EBiEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_48xAAEBiEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_48y1MEBiEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -200,16 +200,16 @@
</ownedOperation>
<ownedOperation xmi:id="_xRPpUEBjEd6UTJZnztgOLw" name="diff">
<ownedParameter xmi:id="_uItgMEBlEd6UTJZnztgOLw" name="x" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wegS4EBlEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wefEwEBlEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wegS4EBlEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_weiIEEBlEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_u5YvMEBlEd6UTJZnztgOLw" name="n">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zP9G0EBlEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zP3AMEBlEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zP9G0EBlEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_zP-8AEBlEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -217,22 +217,22 @@
</ownedOperation>
<ownedOperation xmi:id="_3D-LAEBlEd6UTJZnztgOLw" name="intg">
<ownedParameter xmi:id="_6iaAwEBlEd6UTJZnztgOLw" name="x" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9qEVQEBlEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9qCgEEBlEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9qEVQEBlEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_9qGKcEBlEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_63PBQEBlEd6UTJZnztgOLw" name="lw" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__eXkcEBlEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__eVvQEBlEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__eXkcEBlEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__eYykEBlEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_69kSwEBlEd6UTJZnztgOLw" name="up" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DnqVEEBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Dnn40EBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DnqVEEBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_DnrjMEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -240,22 +240,22 @@
</ownedOperation>
<ownedOperation xmi:id="_WBPUcEBmEd6UTJZnztgOLw" name="sum">
<ownedParameter xmi:id="_XW1OYEBmEd6UTJZnztgOLw" name="k" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zk8EsEBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Zk62kEBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zk8EsEBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Zk9S0EBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_Xdny4EBmEd6UTJZnztgOLw" name="lw" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bdL_wEBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bdHuUEBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bdL_wEBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bdNN4EBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_XhSx8EBmEd6UTJZnztgOLw" name="up" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_c_e48EBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_c_dq0EBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_c_e48EBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_c_guIEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -265,15 +265,15 @@
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_beo90AnpEdy9WM11hWri2g" name="Real">
<ownedOperation xmi:id="_beo90QnpEdy9WM11hWri2g" name="+">
<ownedParameter xmi:id="_beo90gnpEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_beo90wnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_beo91AnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_beo90wnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_beo91QnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_beo91gnpEdy9WM11hWri2g" name="" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_beo91wnpEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_beo92AnpEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_beo91wnpEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_beo92QnpEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -281,8 +281,8 @@
</ownedOperation>
<ownedOperation xmi:id="_beo92gnpEdy9WM11hWri2g" name="-">
<ownedParameter xmi:id="_OjiucAnrEdy9WM11hWri2g" name="" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OjiucQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OjiucgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OjiucQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_OjiucwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -290,15 +290,15 @@
</ownedOperation>
<ownedOperation xmi:id="_beo93wnpEdy9WM11hWri2g" name="*">
<ownedParameter xmi:id="_Sj_FEAnrEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Sj_FEQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sj_FEgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Sj_FEQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Sj_FEwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_Sj_FFAnrEdy9WM11hWri2g" name="" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Sj_FFQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sj_FFgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Sj_FFQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Sj_FFwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -306,15 +306,15 @@
</ownedOperation>
<ownedOperation xmi:id="_beo96AnpEdy9WM11hWri2g" name="/">
<ownedParameter xmi:id="_VGtggAnrEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VGtggQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VGtgggnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VGtggQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_VGtggwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_VGtghAnrEdy9WM11hWri2g" name="" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VGtghQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VGtghgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VGtghQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_VGtghwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -322,15 +322,15 @@
</ownedOperation>
<ownedOperation xmi:id="_beo98QnpEdy9WM11hWri2g" name=">">
<ownedParameter xmi:id="_YrvGcAnrEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YrvGcQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YrvGcgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YrvGcQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_YrvGcwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_bVc6sAnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVc6sQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bVc6sgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVc6sQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bVc6swnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -338,15 +338,15 @@
</ownedOperation>
<ownedOperation xmi:id="_beo9-gnpEdy9WM11hWri2g" name="&lt;">
<ownedParameter xmi:id="_imgtgAnrEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_imgtgQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_imgtggnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_imgtgQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_imgtgwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_imgthAnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_imgthQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_imgthgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_imgthQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_imgthwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -354,15 +354,15 @@
</ownedOperation>
<ownedOperation xmi:id="_beo-AwnpEdy9WM11hWri2g" name=">=">
<ownedParameter xmi:id="_i9dN4AnrEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i9dN4QnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i9dN4gnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i9dN4QnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_i9dN4wnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_i9dN5AnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i9dN5QnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_i9dN5gnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_i9dN5QnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_i9dN5wnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -370,15 +370,15 @@
</ownedOperation>
<ownedOperation xmi:id="_beo-DAnpEdy9WM11hWri2g" name="&lt;=">
<ownedParameter xmi:id="_jV5jEAnrEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jV5jEQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jV5jEgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jV5jEQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jV5jEwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_jV5jFAnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jV5jFQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jV5jFgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jV5jFQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jV5jFwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -386,15 +386,15 @@
</ownedOperation>
<ownedOperation xmi:id="_beo-FQnpEdy9WM11hWri2g" name="==">
<ownedParameter xmi:id="_jssScAnrEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jssScQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jssScgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jssScQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jssScwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_jssSdAnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jssSdQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jssSdgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jssSdQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jssSdwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -402,15 +402,15 @@
</ownedOperation>
<ownedOperation xmi:id="_beo-HgnpEdy9WM11hWri2g" name="&lt;>">
<ownedParameter xmi:id="_kBs5IAnrEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kBs5IQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kBs5IgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kBs5IQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kBs5IwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_kBs5JAnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kBs5JQnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kBs5JgnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kBs5JQnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kBs5JwnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -418,15 +418,15 @@
</ownedOperation>
<ownedOperation xmi:id="_J5nm4An0Edy9WM11hWri2g" name="abs">
<ownedParameter xmi:id="_J5nm4Qn0Edy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J5nm4gn0Edy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J5nm4wn0Edy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J5nm4gn0Edy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_J5nm5An0Edy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_J5nm5Qn0Edy9WM11hWri2g" name="" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J5nm5gn0Edy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J5nm5wn0Edy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J5nm5gn0Edy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_J5nm6An0Edy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -434,15 +434,15 @@
</ownedOperation>
<ownedOperation xmi:id="_ODQKMEBmEd6UTJZnztgOLw" name="^">
<ownedParameter xmi:id="_ODQKMUBmEd6UTJZnztgOLw" name="p" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ODQKMkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ODQKM0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ODQKMkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ODQKNEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_ODQKNUBmEd6UTJZnztgOLw" name="j" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ODQKNkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ODQKN0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ODQKNkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ODQKOEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -450,16 +450,16 @@
</ownedOperation>
<ownedOperation xmi:id="_evk9kEBmEd6UTJZnztgOLw" name="diff">
<ownedParameter xmi:id="_evk9kUBmEd6UTJZnztgOLw" name="x" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evk9kkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_evk9k0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evk9kkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_evk9lEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_evk9lUBmEd6UTJZnztgOLw" name="n">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evk9lkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_evk9l0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evk9lkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_evk9mEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -467,22 +467,22 @@
</ownedOperation>
<ownedOperation xmi:id="_evk9mUBmEd6UTJZnztgOLw" name="intg">
<ownedParameter xmi:id="_evk9mkBmEd6UTJZnztgOLw" name="x" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evk9m0BmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_evk9nEBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evk9m0BmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_evk9nUBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_evk9nkBmEd6UTJZnztgOLw" name="lw" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlkoEBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_evlkoUBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlkoEBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_evlkokBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_evlko0BmEd6UTJZnztgOLw" name="up" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlkpEBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_evlkpUBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlkpEBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_evlkpkBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -490,22 +490,22 @@
</ownedOperation>
<ownedOperation xmi:id="_evlkp0BmEd6UTJZnztgOLw" name="sum">
<ownedParameter xmi:id="_evlkqEBmEd6UTJZnztgOLw" name="k" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlkqUBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_evlkqkBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlkqUBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_evlkq0BmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_evlkrEBmEd6UTJZnztgOLw" name="lw" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlkrUBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_evlkrkBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlkrUBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_evlkr0BmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_evlksEBmEd6UTJZnztgOLw" name="up" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlksUBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_evlkskBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_evlksUBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_evlks0BmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -515,15 +515,15 @@
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Ddte8AnqEdy9WM11hWri2g" name="Boolean">
<ownedOperation xmi:id="_ypx80AnrEdy9WM11hWri2g" name="or">
<ownedParameter xmi:id="_ypx80QnrEdy9WM11hWri2g" name="b" type="_Ddte8AnqEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypx80gnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ypx80wnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypx80gnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ypx81AnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_ypx81QnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypx81gnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ypx81wnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypx81gnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ypx82AnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -531,15 +531,15 @@
</ownedOperation>
<ownedOperation xmi:id="_4vSigAnrEdy9WM11hWri2g" name="xor">
<ownedParameter xmi:id="_4vSigQnrEdy9WM11hWri2g" name="b" type="_Ddte8AnqEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vSiggnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4vSigwnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vSiggnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_4vSihAnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_4vSihQnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vSihgnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4vSihwnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vSihgnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_4vSiiAnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -547,15 +547,15 @@
</ownedOperation>
<ownedOperation xmi:id="_5EmEIAnrEdy9WM11hWri2g" name="and">
<ownedParameter xmi:id="_5EmEIQnrEdy9WM11hWri2g" name="b" type="_Ddte8AnqEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5EmEIgnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5EmEIwnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5EmEIgnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5EmEJAnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_5EmEJQnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5EmEJgnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5EmEJwnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5EmEJgnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5EmEKAnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -563,8 +563,8 @@
</ownedOperation>
<ownedOperation xmi:id="_6grnoAnrEdy9WM11hWri2g" name="not">
<ownedParameter xmi:id="_6grnpQnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6grnpgnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6grnpwnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6grnpgnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6grnqAnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -572,15 +572,15 @@
</ownedOperation>
<ownedOperation xmi:id="_6x0a8AnrEdy9WM11hWri2g" name="==">
<ownedParameter xmi:id="_6x0a8QnrEdy9WM11hWri2g" name="b" type="_Ddte8AnqEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6x0a8gnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6x0a8wnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6x0a8gnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6x0a9AnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_6x0a9QnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6x0a9gnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6x0a9wnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6x0a9gnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6x0a-AnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -588,15 +588,15 @@
</ownedOperation>
<ownedOperation xmi:id="_7B6FYAnrEdy9WM11hWri2g" name="&lt;>">
<ownedParameter xmi:id="_7B6FYQnrEdy9WM11hWri2g" name="b" type="_Ddte8AnqEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7B6FYgnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7B6FYwnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7B6FYgnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_7B6FZAnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_7B6FZQnrEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7B6FZgnrEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7B6FZwnrEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7B6FZgnrEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_7B6FaAnrEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -606,15 +606,15 @@
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DBKa8AnsEdy9WM11hWri2g" name="UnlimitedNatural">
<ownedOperation xmi:id="_J_4gkAnsEdy9WM11hWri2g" name="+">
<ownedParameter xmi:id="_J_4gkQnsEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J_4gkgnsEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J_4gkwnsEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J_4gkgnsEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_J_4glAnsEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_J_4glQnsEdy9WM11hWri2g" name="" type="_DBKa8AnsEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J_4glgnsEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J_4glwnsEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J_4glgnsEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_J_4gmAnsEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -622,8 +622,8 @@
</ownedOperation>
<ownedOperation xmi:id="_Q0z-wAnxEdy9WM11hWri2g" name="-">
<ownedParameter xmi:id="_Q0z-wQnxEdy9WM11hWri2g" name="" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q0z-wgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q0z-wwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q0z-wgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Q0z-xAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -631,15 +631,15 @@
</ownedOperation>
<ownedOperation xmi:id="_S2wBUAnxEdy9WM11hWri2g" name="*">
<ownedParameter xmi:id="_S2wBUQnxEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S2wBUgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S2wBUwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S2wBUgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_S2wBVAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_S2wBVQnxEdy9WM11hWri2g" name="" type="_DBKa8AnsEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S2wBVgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S2wBVwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S2wBVgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_S2wBWAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -647,15 +647,15 @@
</ownedOperation>
<ownedOperation xmi:id="_Wqrl8AnxEdy9WM11hWri2g" name="/">
<ownedParameter xmi:id="_Wqrl8QnxEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Wqrl8gnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Wqrl8wnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Wqrl8gnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Wqrl9AnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_Wqrl9QnxEdy9WM11hWri2g" name="" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Wqrl9gnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Wqrl9wnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Wqrl9gnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Wqrl-AnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -663,15 +663,15 @@
</ownedOperation>
<ownedOperation xmi:id="_bRIMoAnxEdy9WM11hWri2g" name=">">
<ownedParameter xmi:id="_bRIMoQnxEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bRIMognxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bRIMownxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bRIMognxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bRIMpAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_bRIMpQnxEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bRIMpgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bRIMpwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bRIMpgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_bRIMqAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -679,15 +679,15 @@
</ownedOperation>
<ownedOperation xmi:id="_gWbSgAnxEdy9WM11hWri2g" name="&lt;">
<ownedParameter xmi:id="_gWbSgQnxEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gWbSggnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gWbSgwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gWbSggnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gWbShAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_gWbShQnxEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gWbShgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gWbShwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gWbShgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gWbSiAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -695,15 +695,15 @@
</ownedOperation>
<ownedOperation xmi:id="_gwDTcAnxEdy9WM11hWri2g" name=">=">
<ownedParameter xmi:id="_gwDTcQnxEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gwDTcgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gwDTcwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gwDTcgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gwDTdAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_gwDTdQnxEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gwDTdgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gwDTdwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gwDTdgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gwDTeAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -711,15 +711,15 @@
</ownedOperation>
<ownedOperation xmi:id="_iGCO8AnxEdy9WM11hWri2g" name="&lt;=">
<ownedParameter xmi:id="_iGCO8QnxEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iGCO8gnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iGCO8wnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iGCO8gnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_iGCO9AnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_iGCO9QnxEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iGCO9gnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iGCO9wnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iGCO9gnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_iGCO-AnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -727,15 +727,15 @@
</ownedOperation>
<ownedOperation xmi:id="_iYgfAAnxEdy9WM11hWri2g" name="==">
<ownedParameter xmi:id="_iYgfAQnxEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iYgfAgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iYgfAwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iYgfAgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_iYgfBAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_iYgfBQnxEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iYgfBgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iYgfBwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iYgfBgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_iYgfCAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -743,15 +743,15 @@
</ownedOperation>
<ownedOperation xmi:id="_isxe0AnxEdy9WM11hWri2g" name="&lt;>">
<ownedParameter xmi:id="_isxe0QnxEdy9WM11hWri2g" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_isxe0gnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_isxe0wnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_isxe0gnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_isxe1AnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_isxe1QnxEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_isxe1gnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_isxe1wnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_isxe1gnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_isxe2AnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -759,15 +759,15 @@
</ownedOperation>
<ownedOperation xmi:id="_Z75uEA4uEdysTsAUPnp57Q" name="mod">
<ownedParameter xmi:id="_Z75uEQ4uEdysTsAUPnp57Q" name="un" type="_DBKa8AnsEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z75uEg4uEdysTsAUPnp57Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z75uEw4uEdysTsAUPnp57Q" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z75uEg4uEdysTsAUPnp57Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Z75uFA4uEdysTsAUPnp57Q">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_Z75uFQ4uEdysTsAUPnp57Q" name="" type="_DBKa8AnsEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z75uFg4uEdysTsAUPnp57Q" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z75uFw4uEdysTsAUPnp57Q" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z75uFg4uEdysTsAUPnp57Q" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Z75uGA4uEdysTsAUPnp57Q">
<value xsi:nil="true"/>
</defaultValue>
@@ -775,15 +775,15 @@
</ownedOperation>
<ownedOperation xmi:id="_kfGFIEBmEd6UTJZnztgOLw" name="^">
<ownedParameter xmi:id="_kfGFIUBmEd6UTJZnztgOLw" name="p" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFIkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGFI0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFIkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGFJEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_kfGFJUBmEd6UTJZnztgOLw" name="j" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFJkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGFJ0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFJkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGFKEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -791,16 +791,16 @@
</ownedOperation>
<ownedOperation xmi:id="_kfGFKUBmEd6UTJZnztgOLw" name="diff">
<ownedParameter xmi:id="_kfGFKkBmEd6UTJZnztgOLw" name="x" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFK0BmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGFLEBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFK0BmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGFLUBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_kfGFLkBmEd6UTJZnztgOLw" name="n">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFL0BmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGFMEBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFL0BmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGFMUBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -808,22 +808,22 @@
</ownedOperation>
<ownedOperation xmi:id="_kfGFMkBmEd6UTJZnztgOLw" name="intg">
<ownedParameter xmi:id="_kfGFM0BmEd6UTJZnztgOLw" name="x" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFNEBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGFNUBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFNEBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGFNkBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_kfGFN0BmEd6UTJZnztgOLw" name="lw" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFOEBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGFOUBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFOEBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGFOkBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_kfGFO0BmEd6UTJZnztgOLw" name="up" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFPEBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGFPUBmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGFPEBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGFPkBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -831,22 +831,22 @@
</ownedOperation>
<ownedOperation xmi:id="_kfGsMEBmEd6UTJZnztgOLw" name="sum">
<ownedParameter xmi:id="_kfGsMUBmEd6UTJZnztgOLw" name="k" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGsMkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGsM0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGsMkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGsNEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_kfGsNUBmEd6UTJZnztgOLw" name="lw" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGsNkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGsN0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGsNkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGsOEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_kfGsOUBmEd6UTJZnztgOLw" name="up" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGsOkBmEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kfGsO0BmEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kfGsOkBmEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kfGsPEBmEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -856,15 +856,15 @@
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_qZ3GUAnxEdy9WM11hWri2g" name="String">
<ownedOperation xmi:id="_wukloAnxEdy9WM11hWri2g" name="concat">
<ownedParameter xmi:id="_wukloQnxEdy9WM11hWri2g" name="s" type="_qZ3GUAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wuklognxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wuklownxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wuklognxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_wuklpAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_wuklpQnxEdy9WM11hWri2g" name="" type="_qZ3GUAnxEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wuklpgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wuklpwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wuklpgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_wuklqAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -872,15 +872,15 @@
</ownedOperation>
<ownedOperation xmi:id="_6BRgEAnxEdy9WM11hWri2g" name="==">
<ownedParameter xmi:id="_6BRgEQnxEdy9WM11hWri2g" name="s" type="_qZ3GUAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6BRgEgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6BRgEwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6BRgEgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6BRgFAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_6BRgFQnxEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6BRgFgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6BRgFwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6BRgFgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6BRgGAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -888,15 +888,15 @@
</ownedOperation>
<ownedOperation xmi:id="_6efAgAnxEdy9WM11hWri2g" name="&lt;>">
<ownedParameter xmi:id="_6efAgQnxEdy9WM11hWri2g" name="s" type="_qZ3GUAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6efAggnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6efAgwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6efAggnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6efAhAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_6efAhQnxEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6efAhgnxEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6efAhwnxEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6efAhgnxEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6efAiAnxEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -906,15 +906,15 @@
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_sexkYAnxEdy9WM11hWri2g" name="DateTime">
<ownedOperation xmi:id="_9H2aAAnyEdy9WM11hWri2g" name="+">
<ownedParameter xmi:id="_9H2aAQnyEdy9WM11hWri2g" name="r" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9H2aAgnyEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9H2aAwnyEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9H2aAgnyEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_9H2aBAnyEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_9H2aBQnyEdy9WM11hWri2g" name="" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9H2aBgnyEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9H2aBwnyEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9H2aBgnyEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_9H2aCAnyEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -922,8 +922,8 @@
</ownedOperation>
<ownedOperation xmi:id="_9H2aCQnyEdy9WM11hWri2g" name="-">
<ownedParameter xmi:id="_9H2aCgnyEdy9WM11hWri2g" name="" type="_beo90AnpEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9H2aCwnyEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9H2aDAnyEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9H2aCwnyEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_9H2aDQnyEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -931,15 +931,15 @@
</ownedOperation>
<ownedOperation xmi:id="_GtjI8AnzEdy9WM11hWri2g" name=">">
<ownedParameter xmi:id="_GtjI8QnzEdy9WM11hWri2g" name="s" type="_sexkYAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GtjI8gnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GtjI8wnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GtjI8gnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GtjI9AnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_GtjI9QnzEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GtjI9gnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GtjI9wnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GtjI9gnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GtjI-AnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -947,15 +947,15 @@
</ownedOperation>
<ownedOperation xmi:id="_TEP_4AnzEdy9WM11hWri2g" name="&lt;">
<ownedParameter xmi:id="_TEP_4QnzEdy9WM11hWri2g" name="s" type="_sexkYAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TEP_4gnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TEP_4wnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TEP_4gnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TEP_5AnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_TEP_5QnzEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TEP_5gnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TEP_5wnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TEP_5gnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TEP_6AnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -963,15 +963,15 @@
</ownedOperation>
<ownedOperation xmi:id="_TtrXYAnzEdy9WM11hWri2g" name=">=">
<ownedParameter xmi:id="_TtrXYQnzEdy9WM11hWri2g" name="s" type="_sexkYAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TtrXYgnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TtrXYwnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TtrXYgnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TtrXZAnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_TtrXZQnzEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TtrXZgnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TtrXZwnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TtrXZgnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_TtrXaAnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -979,15 +979,15 @@
</ownedOperation>
<ownedOperation xmi:id="_UXPRwAnzEdy9WM11hWri2g" name="&lt;=">
<ownedParameter xmi:id="_UXPRwQnzEdy9WM11hWri2g" name="s" type="_sexkYAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UXPRwgnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UXPRwwnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UXPRwgnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UXPRxAnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_UXPRxQnzEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UXPRxgnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UXPRxwnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UXPRxgnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UXPRyAnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -995,15 +995,15 @@
</ownedOperation>
<ownedOperation xmi:id="_UoOUEAnzEdy9WM11hWri2g" name="==">
<ownedParameter xmi:id="_UoOUEQnzEdy9WM11hWri2g" name="s" type="_sexkYAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UoOUEgnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UoOUEwnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UoOUEgnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UoOUFAnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_UoOUFQnzEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UoOUFgnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UoOUFwnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UoOUFgnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UoOUGAnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -1011,15 +1011,15 @@
</ownedOperation>
<ownedOperation xmi:id="_U20wwAnzEdy9WM11hWri2g" name="&lt;>">
<ownedParameter xmi:id="_U20wwQnzEdy9WM11hWri2g" name="s" type="_sexkYAnxEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U20wwgnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U20wwwnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U20wwgnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_U20wxAnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_U20wxQnzEdy9WM11hWri2g" name="" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U20wxgnzEdy9WM11hWri2g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U20wxwnzEdy9WM11hWri2g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U20wxgnzEdy9WM11hWri2g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_U20wyAnzEdy9WM11hWri2g">
<value xsi:nil="true"/>
</defaultValue>
@@ -1093,8 +1093,8 @@
<packageImport xmi:id="_tfw-YBXFEdyBX5GHlMLAlg" importedPackage="_l6ms8A74EdyML4mHwjNDrw"/>
<packagedElement xmi:type="uml:DataType" xmi:id="_Ng1kMAeOEdytasR0-Ec7ew" name="EDF_Parameters">
<ownedAttribute xmi:id="_ie8gYAePEdytasR0-Ec7ew" name="deadline" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ok0ScQePEdytasR0-Ec7ew" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ok0ScAePEdytasR0-Ec7ew"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ok0ScQePEdytasR0-Ec7ew" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ok-DcAePEdytasR0-Ec7ew">
<value xsi:nil="true"/>
</defaultValue>
@@ -1127,37 +1127,37 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_d6I-0BFbEdyUJeMeN__D-A" name="SchedParameters">
<ownedAttribute xmi:id="_i_STsBFbEdyUJeMeN__D-A" name="edf" visibility="public" type="_Ng1kMAeOEdytasR0-Ec7ew" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxR-oBFbEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxINoBFbEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxR-oBFbEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_mxR-oRFbEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_jGSTkBFbEdyUJeMeN__D-A" name="fp" visibility="public" type="_rnEo4BFbEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qvC0sBFbEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qu5DsBFbEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qvC0sBFbEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_qvC0sRFbEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_jKwj4BFbEdyUJeMeN__D-A" name="pooling" visibility="public" type="_LBY6sBFcEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zgr10BFcEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Zgir4BFcEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zgr10BFcEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Zgr10RFcEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_jWrgABFbEdyUJeMeN__D-A" name="server" visibility="public" type="_yayYYBFbEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cRkCABFcEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cRa4EBFcEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cRkCABFcEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cRkCARFcEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_CvstADMBEd2-hZkEerSQAg" name="tableEntryKey" visibility="public" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OpaqueExpression"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fhwk8DMBEd2-hZkEerSQAg" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FhnbADMBEd2-hZkEerSQAg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Fhwk8DMBEd2-hZkEerSQAg" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Fh6V8DMBEd2-hZkEerSQAg">
<value xsi:nil="true"/>
</defaultValue>
@@ -1165,8 +1165,8 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_rnEo4BFbEdyUJeMeN__D-A" name="FixedPriorityParameters">
<ownedAttribute xmi:id="_tn-JoBFbEdyUJeMeN__D-A" name="priority" visibility="public" type="_0KWSgBFQEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vdYzIBFbEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vdPpMBFbEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vdYzIBFbEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_vdikIBFbEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1175,36 +1175,36 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_yayYYBFbEdyUJeMeN__D-A" name="PeriodicServerParameters">
<generalization xmi:id="_8xj38BQZEdyxdNz5FjtZ_g" general="_rnEo4BFbEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_2KsYoBFbEdyUJeMeN__D-A" name="kind" visibility="public" type="_UP5HEBFbEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4oyywBFbEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4opBwBFbEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4oyywBFbEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_4oyywRFbEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_2RGioBFbEdyUJeMeN__D-A" name="backgroundPriority" visibility="public" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8RGWMRFbEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8RGWMBFbEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8RGWMRFbEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8RQHMBFbEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_2a70EBFbEdyUJeMeN__D-A" name="initialBudget" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AHHlgRFcEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AHHlgBFcEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AHHlgRFcEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_AHRWgBFcEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_2kBeoBFbEdyUJeMeN__D-A" name="replenishPeriod" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DHpXQRFcEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DHpXQBFcEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DHpXQRFcEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_DHyhMBFcEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_2n5SABFbEdyUJeMeN__D-A" name="maxPendingReplenish" visibility="public" type="_0KWSgBFQEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HsATQBFcEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hr2iQBFcEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HsATQBFcEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HsKEQBFcEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1213,15 +1213,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_LBY6sBFcEdyUJeMeN__D-A" name="PoolingParameters">
<generalization xmi:id="_OLDTUBQaEdyxdNz5FjtZ_g" general="_rnEo4BFbEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_MozkcBFcEdyUJeMeN__D-A" name="period" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O6_CcBFcEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_O61RcBFcEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O6_CcBFcEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_O6_CcRFcEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_M1BbgBFcEdyUJeMeN__D-A" name="overhead" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R0zIMBFcEdyUJeMeN__D-A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R0p-QBFcEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R0zIMBFcEdyUJeMeN__D-A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_R085MBFcEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1229,13 +1229,13 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_HRbMoLGzEd-tmN4hwNCxXQ" name="ScheduleSpecification">
<ownedAttribute xmi:id="_PyyJsLGzEd-tmN4hwNCxXQ" name="ttd" type="_LcrFELGzEd-tmN4hwNCxXQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TjpzQbGzEd-tmN4hwNCxXQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TjpzQLGzEd-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TjpzQbGzEd-tmN4hwNCxXQ" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_UxCzcLGzEd-tmN4hwNCxXQ" name="other" visibility="public">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OpaqueExpression"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YUwKwbGzEd-tmN4hwNCxXQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YUwKwLGzEd-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YUwKwbGzEd-tmN4hwNCxXQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_YUwKwrGzEd-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -1243,15 +1243,15 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_LcrFELGzEd-tmN4hwNCxXQ" name="TableDrivenSchedule">
<ownedAttribute xmi:id="_at5zcLGzEd-tmN4hwNCxXQ" name="frameCycleTime" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dtAB0LGzEd-tmN4hwNCxXQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ds234LGzEd-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dtAB0LGzEd-tmN4hwNCxXQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_dtAB0bGzEd-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_evh10LGzEd-tmN4hwNCxXQ" name="entries" visibility="public" type="_NxGl0LGzEd-tmN4hwNCxXQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_g8xwgbGzEd-tmN4hwNCxXQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_g8xwgLGzEd-tmN4hwNCxXQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_g8xwgbGzEd-tmN4hwNCxXQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_g866cLGzEd-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -1260,22 +1260,22 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_NxGl0LGzEd-tmN4hwNCxXQ" name="TableEntryType">
<ownedAttribute xmi:id="_ipa4gLGzEd-tmN4hwNCxXQ" name="entryKey" visibility="public">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#OpaqueExpression"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lmS5UbGzEd-tmN4hwNCxXQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lmS5ULGzEd-tmN4hwNCxXQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lmS5UbGzEd-tmN4hwNCxXQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_lmS5UrGzEd-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_mSyy8LGzEd-tmN4hwNCxXQ" name="timeSlot" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isOrdered="true">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_o-2JgLGzEd-tmN4hwNCxXQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_o-sYgLGzEd-tmN4hwNCxXQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_o-2JgLGzEd-tmN4hwNCxXQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_o-2JgbGzEd-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_q6ORELGzEd-tmN4hwNCxXQ" name="offset" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isOrdered="true">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s2M1kbGzEd-tmN4hwNCxXQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s2M1kLGzEd-tmN4hwNCxXQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s2M1kbGzEd-tmN4hwNCxXQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_s2WmkLGzEd-tmN4hwNCxXQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -1293,23 +1293,23 @@
<packageImport xmi:id="_CcEQMB18EdyUAqqkOL30sg" importedPackage="_l6ms8A74EdyML4mHwjNDrw"/>
<packagedElement xmi:type="uml:DataType" xmi:id="_WkRCQBD_EdyybZnLxHsjyA" name="IntegerVector">
<ownedAttribute xmi:id="_YqhkIBD_EdyybZnLxHsjyA" name="vectorElem" visibility="public" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dF8mkRD_EdyybZnLxHsjyA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dF8mkBD_EdyybZnLxHsjyA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dF8mkRD_EdyybZnLxHsjyA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_dGGXkBD_EdyybZnLxHsjyA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedOperation xmi:id="_WpevcECCEd6UTJZnztgOLw" name="at">
<ownedParameter xmi:id="_YFJcMECCEd6UTJZnztgOLw" name="i" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aF1hkECCEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aF06gECCEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aF1hkECCEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_aF2vsECCEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_YQqvsECCEd6UTJZnztgOLw" name="p" type="_HJ1zcAnfEdy9WM11hWri2g" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cdCCcECCEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cdA0UECCEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cdCCcECCEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cdCpgECCEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1318,8 +1318,8 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_yhmP0BD_EdyybZnLxHsjyA" name="IntegerMatrix">
<ownedAttribute xmi:id="_2qGWQBD_EdyybZnLxHsjyA" name="matrixElem" visibility="public" type="_WkRCQBD_EdyybZnLxHsjyA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2qGWQRD_EdyybZnLxHsjyA" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2qGWQhD_EdyybZnLxHsjyA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2qGWQRD_EdyybZnLxHsjyA" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_2qGWQxD_EdyybZnLxHsjyA">
<value xsi:nil="true"/>
</defaultValue>
@@ -1327,15 +1327,15 @@
<ownedOperation xmi:id="_nnAAgECCEd6UTJZnztgOLw" name="at">
<ownedParameter xmi:id="_pxEEUECCEd6UTJZnztgOLw" name="i">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vfql4ECCEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vfpXwECCEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vfql4ECCEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_vfrM8ECCEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_p_e60ECCEd6UTJZnztgOLw" name="p" type="_WkRCQBD_EdyybZnLxHsjyA" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tsPgcECCEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tsNrQECCEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tsPgcECCEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_tsZRcECCEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1345,11 +1345,11 @@
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_bManMBEBEdyx6M3BlUjlCQ" name="VSL_Expression"/>
<packagedElement xmi:type="uml:DataType" xmi:id="_ehpdoBEBEdyx6M3BlUjlCQ" name="IntegerInterval">
<templateBinding xmi:id="_qgnOkB15EdyUAqqkOL30sg" signature="_ZPYXUB15EdyUAqqkOL30sg">
- <parameterSubstitution xmi:id="_aPAg8B18EdyUAqqkOL30sg" formal="_aVg48B15EdyUAqqkOL30sg" actual="_HJ1zcAnfEdy9WM11hWri2g"/>
+ <parameterSubstitution xmi:id="_aPAg8B18EdyUAqqkOL30sg" actual="_HJ1zcAnfEdy9WM11hWri2g" formal="_aVg48B15EdyUAqqkOL30sg"/>
</templateBinding>
<ownedAttribute xmi:id="_iG-lkBEBEdyx6M3BlUjlCQ" name="bound" visibility="public" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lZ1dcREBEdyx6M3BlUjlCQ" value="2"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lZ1dcBEBEdyx6M3BlUjlCQ" value="2"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lZ1dcREBEdyx6M3BlUjlCQ" value="2"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_lZ-nYBEBEdyx6M3BlUjlCQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -1363,8 +1363,8 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_4TENQBEBEdyx6M3BlUjlCQ" name="UtilityType">
<ownedOperation xmi:id="_BegcUBQnEdyxdNz5FjtZ_g" name="eq" isStatic="true">
<ownedParameter xmi:id="_Dc9tEBQnEdyxdNz5FjtZ_g" name="u" type="_4TENQBEBEdyx6M3BlUjlCQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HSkssBQnEdyxdNz5FjtZ_g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HSRxwBQnEdyxdNz5FjtZ_g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HSkssBQnEdyxdNz5FjtZ_g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HSkssRQnEdyxdNz5FjtZ_g">
<value xsi:nil="true"/>
</defaultValue>
@@ -1373,8 +1373,8 @@
</ownedOperation>
<ownedOperation xmi:id="__JbJYBQoEdyxdNz5FjtZ_g" name="lt" isStatic="true">
<ownedParameter xmi:id="_FjqB4BQpEdyxdNz5FjtZ_g" name="u" type="_4TENQBEBEdyx6M3BlUjlCQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HhxUYBQpEdyxdNz5FjtZ_g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HhnjYBQpEdyxdNz5FjtZ_g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HhxUYBQpEdyxdNz5FjtZ_g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Hh7FYBQpEdyxdNz5FjtZ_g">
<value xsi:nil="true"/>
</defaultValue>
@@ -1383,8 +1383,8 @@
</ownedOperation>
<ownedOperation xmi:id="_kjUQoBQsEdyxdNz5FjtZ_g" name="gt" isStatic="true">
<ownedParameter xmi:id="_kjUQoRQsEdyxdNz5FjtZ_g" name="u" type="_4TENQBEBEdyx6M3BlUjlCQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kjUQohQsEdyxdNz5FjtZ_g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kjUQoxQsEdyxdNz5FjtZ_g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kjUQohQsEdyxdNz5FjtZ_g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kjUQpBQsEdyxdNz5FjtZ_g">
<value xsi:nil="true"/>
</defaultValue>
@@ -1393,8 +1393,8 @@
</ownedOperation>
<ownedOperation xmi:id="_k7_2YBQsEdyxdNz5FjtZ_g" name="le" isStatic="true">
<ownedParameter xmi:id="_k7_2YRQsEdyxdNz5FjtZ_g" name="u" type="_4TENQBEBEdyx6M3BlUjlCQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k7_2YhQsEdyxdNz5FjtZ_g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k7_2YxQsEdyxdNz5FjtZ_g" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k7_2YhQsEdyxdNz5FjtZ_g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_k7_2ZBQsEdyxdNz5FjtZ_g">
<value xsi:nil="true"/>
</defaultValue>
@@ -1403,8 +1403,8 @@
</ownedOperation>
<ownedOperation xmi:id="_LJfvYBQxEdyCa-N9ek5e_w" name="ge" isStatic="true">
<ownedParameter xmi:id="_LJfvYRQxEdyCa-N9ek5e_w" name="u" type="_4TENQBEBEdyx6M3BlUjlCQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LJfvYhQxEdyCa-N9ek5e_w" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LJfvYxQxEdyCa-N9ek5e_w" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LJfvYhQxEdyCa-N9ek5e_w" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LJfvZBQxEdyCa-N9ek5e_w">
<value xsi:nil="true"/>
</defaultValue>
@@ -1413,8 +1413,8 @@
</ownedOperation>
<ownedOperation xmi:id="_LsyCoBQxEdyCa-N9ek5e_w" name="ne" isStatic="true">
<ownedParameter xmi:id="_LsyCoRQxEdyCa-N9ek5e_w" name="u" type="_4TENQBEBEdyx6M3BlUjlCQ">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LsyCohQxEdyCa-N9ek5e_w" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LsyCoxQxEdyCa-N9ek5e_w" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LsyCohQxEdyCa-N9ek5e_w" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_LsyCpBQxEdyCa-N9ek5e_w">
<value xsi:nil="true"/>
</defaultValue>
@@ -1430,21 +1430,21 @@
<ownedParameter xmi:id="_sTfRkPITEd-bDvjz4njK7A" parameteredElement="_1lrhUBXgEdyC88-N-gXBsQ"/>
</ownedTemplateSignature>
<ownedAttribute xmi:id="_gdsBoBEDEdyx6M3BlUjlCQ" name="vectorElement" visibility="public" type="_mg4UsEB8Ed6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1lrhUBXgEdyC88-N-gXBsQ" name="k" templateParameter="_sTfRkPITEd-bDvjz4njK7A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1lhwUBXgEdyC88-N-gXBsQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1lrhUBXgEdyC88-N-gXBsQ" name="k" templateParameter="_sTfRkPITEd-bDvjz4njK7A" value="*"/>
</ownedAttribute>
<ownedOperation xmi:id="_7RLsIECCEd6UTJZnztgOLw" name="at">
<ownedParameter xmi:id="_9RU-8ECCEd6UTJZnztgOLw" name="i">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__hN98ECCEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__hMIwECCEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__hN98ECCEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__hXu8ECCEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_9Sn_cECCEd6UTJZnztgOLw" name="p" type="_mg4UsEB8Ed6UTJZnztgOLw" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ff5i4ECDEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ff470ECDEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ff5i4ECDEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Ff6xAECDEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1453,11 +1453,11 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_6ekucBXWEdyC88-N-gXBsQ" name="Realnterval">
<templateBinding xmi:id="_rOLfMB15EdyUAqqkOL30sg" signature="_ZPYXUB15EdyUAqqkOL30sg">
- <parameterSubstitution xmi:id="_V3tJgB18EdyUAqqkOL30sg" formal="_aVg48B15EdyUAqqkOL30sg" actual="_beo90AnpEdy9WM11hWri2g"/>
+ <parameterSubstitution xmi:id="_V3tJgB18EdyUAqqkOL30sg" actual="_beo90AnpEdy9WM11hWri2g" formal="_aVg48B15EdyUAqqkOL30sg"/>
</templateBinding>
<ownedAttribute xmi:id="_94t6EBXWEdyC88-N-gXBsQ" name="bound" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HEJH0BXXEdyC88-N-gXBsQ" value="2"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HD_94BXXEdyC88-N-gXBsQ" value="2"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HEJH0BXXEdyC88-N-gXBsQ" value="2"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HEJH0RXXEdyC88-N-gXBsQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -1465,11 +1465,11 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_DaoHAB14EdyUAqqkOL30sg" name="NFP_FrequencyInterval">
<templateBinding xmi:id="_rxBGgB15EdyUAqqkOL30sg" signature="_ZPYXUB15EdyUAqqkOL30sg">
- <parameterSubstitution xmi:id="_uXxtYB15EdyUAqqkOL30sg" formal="_aVg48B15EdyUAqqkOL30sg" actual="_UDZSQBFSEdyUJeMeN__D-A"/>
+ <parameterSubstitution xmi:id="_uXxtYB15EdyUAqqkOL30sg" actual="_UDZSQBFSEdyUJeMeN__D-A" formal="_aVg48B15EdyUAqqkOL30sg"/>
</templateBinding>
<ownedAttribute xmi:id="_GZC_8B14EdyUAqqkOL30sg" name="bound" visibility="public" type="_UDZSQBFSEdyUJeMeN__D-A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Rua_8B18EdyUAqqkOL30sg" value="2"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RuRO8B18EdyUAqqkOL30sg" value="2"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Rua_8B18EdyUAqqkOL30sg" value="2"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_QxUegR18EdyUAqqkOL30sg">
<value xsi:nil="true"/>
</defaultValue>
@@ -1482,8 +1482,8 @@
</ownedParameter>
</ownedTemplateSignature>
<ownedAttribute xmi:id="_Uc9xMB15EdyUAqqkOL30sg" name="bound" visibility="public" type="_bWRyYB15EdyUAqqkOL30sg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hJnqAB15EdyUAqqkOL30sg" value="2"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hJd5AB15EdyUAqqkOL30sg" value="2"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hJnqAB15EdyUAqqkOL30sg" value="2"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_hJnqAR15EdyUAqqkOL30sg">
<value xsi:nil="true"/>
</defaultValue>
@@ -1491,11 +1491,11 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_rq2FsB18EdyUAqqkOL30sg" name="NFP_NaturalInterval">
<templateBinding xmi:id="_vYQyoB18EdyUAqqkOL30sg" signature="_ZPYXUB15EdyUAqqkOL30sg">
- <parameterSubstitution xmi:id="_x5hOcB18EdyUAqqkOL30sg" formal="_aVg48B15EdyUAqqkOL30sg" actual="_Asy1gBFIEdyUJeMeN__D-A"/>
+ <parameterSubstitution xmi:id="_x5hOcB18EdyUAqqkOL30sg" actual="_Asy1gBFIEdyUJeMeN__D-A" formal="_aVg48B15EdyUAqqkOL30sg"/>
</templateBinding>
<ownedAttribute xmi:id="_9CLk8B18EdyUAqqkOL30sg" name="bound" visibility="public" type="_Asy1gBFIEdyUJeMeN__D-A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__O2Q0R18EdyUAqqkOL30sg" value="2"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__O2Q0B18EdyUAqqkOL30sg" value="2"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__O2Q0R18EdyUAqqkOL30sg" value="2"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__PAB0B18EdyUAqqkOL30sg">
<value xsi:nil="true"/>
</defaultValue>
@@ -1503,8 +1503,8 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_F0-CsEB9Ed6UTJZnztgOLw" name="RealVector">
<ownedAttribute xmi:id="_M7eyYEB9Ed6UTJZnztgOLw" name="vectorElem" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RK1HsEB9Ed6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RKnFQEB9Ed6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RK1HsEB9Ed6UTJZnztgOLw" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RLCjEEB9Ed6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1512,15 +1512,15 @@
<ownedOperation xmi:id="_VCKloEB9Ed6UTJZnztgOLw" name="at">
<ownedParameter xmi:id="_Y_syMEB9Ed6UTJZnztgOLw" name="i">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dj1rwEB9Ed6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dj0doEB9Ed6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dj1rwEB9Ed6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_dj254EB9Ed6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_bFYFQEB9Ed6UTJZnztgOLw" name="p" type="_beo90AnpEdy9WM11hWri2g" direction="return">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hA9S4EB9Ed6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hA5BcEB9Ed6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hA9S4EB9Ed6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_hA_IEEB9Ed6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1529,8 +1529,8 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_I11ysEB9Ed6UTJZnztgOLw" name="RealMatrix">
<ownedAttribute xmi:id="_NK0O4EB9Ed6UTJZnztgOLw" name="matrixElem" visibility="public" type="_F0-CsEB9Ed6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UBX3AEB9Ed6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UBTlkEB9Ed6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UBX3AEB9Ed6UTJZnztgOLw" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UBgZ4EB9Ed6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1538,15 +1538,15 @@
<ownedOperation xmi:id="_qxYjwECAEd6UTJZnztgOLw" name="at">
<ownedParameter xmi:id="_riyLgECAEd6UTJZnztgOLw" name="i">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vg3xsECAEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vg0HUECAEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vg3xsECAEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_vg4YwECAEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_rqy4AECAEd6UTJZnztgOLw" name="p" type="_F0-CsEB9Ed6UTJZnztgOLw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xh-t0ECAEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xh7qgECAEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xh-t0ECAEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_xiAjAECAEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1585,37 +1585,37 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_ACuvABD_EdyybZnLxHsjyA" name="NFP_CommonType">
<ownedAttribute xmi:id="_EC4KsBD_EdyybZnLxHsjyA" name="expr" visibility="public" type="_bManMBEBEdyx6M3BlUjlCQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GJSdkRD_EdyybZnLxHsjyA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GJSdkBD_EdyybZnLxHsjyA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GJSdkRD_EdyybZnLxHsjyA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_GJSdkhD_EdyybZnLxHsjyA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_EHDgEBD_EdyybZnLxHsjyA" name="source" visibility="public" type="_oMZzEBD-EdyybZnLxHsjyA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DUfX4BFFEdyBd9q9NMDXUQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DUVm4BFFEdyBd9q9NMDXUQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DUfX4BFFEdyBd9q9NMDXUQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_DUfX4RFFEdyBd9q9NMDXUQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_ELFEcBD_EdyybZnLxHsjyA" name="statQ" visibility="public" type="_0N52EBD-EdyybZnLxHsjyA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gei5EBFFEdyBd9q9NMDXUQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GeZIEBFFEdyBd9q9NMDXUQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gei5EBFFEdyBd9q9NMDXUQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Gei5ERFFEdyBd9q9NMDXUQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_EO830BD_EdyybZnLxHsjyA" name="dir" visibility="public" type="_vvfxEBD-EdyybZnLxHsjyA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JSZgwBFFEdyBd9q9NMDXUQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JSQW0BFFEdyBd9q9NMDXUQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JSZgwBFFEdyBd9q9NMDXUQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_JSZgwRFFEdyBd9q9NMDXUQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_D8K-8ECGEd6UTJZnztgOLw" name="mode" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HHE0sECGEd6UTJZnztgOLw" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HGzu8ECGEd6UTJZnztgOLw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HHE0sECGEd6UTJZnztgOLw" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_HHLiYECGEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1647,8 +1647,8 @@
</ownedOperation>
<ownedOperation xmi:id="_dYnkIECGEd6UTJZnztgOLw" name="bernoulli">
<ownedParameter xmi:id="_xxPqIECGEd6UTJZnztgOLw" name="prob" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0E5HwECGEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0E02UECGEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0E5HwECGEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_0E6V4ECGEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1656,15 +1656,15 @@
</ownedOperation>
<ownedOperation xmi:id="_fi_xAECGEd6UTJZnztgOLw" name="binomial">
<ownedParameter xmi:id="_2YcewECGEd6UTJZnztgOLw" name="prob" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4otRMECGEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4oo_wECGEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4otRMECGEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_4ovGYECGEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_448soECGEd6UTJZnztgOLw" name="trials" type="_HJ1zcAnfEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6uIsoECGEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6uFCQECGEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6uIsoECGEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6uMXAECGEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1672,8 +1672,8 @@
</ownedOperation>
<ownedOperation xmi:id="_fs-zcECGEd6UTJZnztgOLw" name="exp">
<ownedParameter xmi:id="_8F37oECGEd6UTJZnztgOLw" name="mean" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-yGRUECGEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-yCm8ECGEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-yGRUECGEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-yHfcECGEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1681,15 +1681,15 @@
</ownedOperation>
<ownedOperation xmi:id="_ggbCkECGEd6UTJZnztgOLw" name="normal">
<ownedParameter xmi:id="_DmkF4ECHEd6UTJZnztgOLw" name="mean" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FupMsECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FumJYECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FupMsECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Fu-j4ECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_D7InsECHEd6UTJZnztgOLw" name="standDev" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Iw9uMECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Iw75AECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Iw9uMECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_IxGREECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1697,8 +1697,8 @@
</ownedOperation>
<ownedOperation xmi:id="_gtRLwECGEd6UTJZnztgOLw" name="poisson">
<ownedParameter xmi:id="_JNIFwECHEd6UTJZnztgOLw" name="mean" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MvIM4ECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MvD7cECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MvIM4ECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_MvPhoECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1706,15 +1706,15 @@
</ownedOperation>
<ownedOperation xmi:id="_g3ISYECGEd6UTJZnztgOLw" name="uniform">
<ownedParameter xmi:id="_j2ETQECHEd6UTJZnztgOLw" name="min" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mGdokECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mGYwEECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mGdokECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_mGgE0ECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_j5HAMECHEd6UTJZnztgOLw" name="max" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nxjRYECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nxe_8ECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nxjRYECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nxkfgECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1722,8 +1722,8 @@
</ownedOperation>
<ownedOperation xmi:id="_g-rr4ECGEd6UTJZnztgOLw" name="geometric">
<ownedParameter xmi:id="_ov2FoECHEd6UTJZnztgOLw" name="p" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qo3cwECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qo1AgECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qo3cwECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_qo5R8ECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1731,22 +1731,22 @@
</ownedOperation>
<ownedOperation xmi:id="_hFs54ECGEd6UTJZnztgOLw" name="triangular">
<ownedParameter xmi:id="_rb2_8ECHEd6UTJZnztgOLw" name="min" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tPJigECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tPHtUECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tPJigECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_tPKwoECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_re33sECHEd6UTJZnztgOLw" name="max" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u3up4ECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u3rmkECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u3up4ECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_u35B8ECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
<ownedParameter xmi:id="_rhixMECHEd6UTJZnztgOLw" name="mode" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wsP7gECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wsNfQECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wsP7gECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_wsRJoECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1754,8 +1754,8 @@
</ownedOperation>
<ownedOperation xmi:id="_hPOCQECGEd6UTJZnztgOLw" name="logarithmic">
<ownedParameter xmi:id="_xh1fsECHEd6UTJZnztgOLw" name="theta" type="_beo90AnpEdy9WM11hWri2g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zbvAkECHEd6UTJZnztgOLw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zbphAECHEd6UTJZnztgOLw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zbvAkECHEd6UTJZnztgOLw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_zb1HMECHEd6UTJZnztgOLw">
<value xsi:nil="true"/>
</defaultValue>
@@ -1766,8 +1766,8 @@
<generalization xmi:id="_98XVQBFHEdyUJeMeN__D-A" general="_ACuvABD_EdyybZnLxHsjyA"/>
<generalization xmi:id="_xX10EEIlEd6dmI2dd6jVFQ" general="_Ddte8AnqEdy9WM11hWri2g"/>
<ownedAttribute xmi:id="_76_I0BFGEdyBd9q9NMDXUQ" name="value" visibility="public" type="_Ddte8AnqEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-lKQERFGEdyBd9q9NMDXUQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-lKQEBFGEdyBd9q9NMDXUQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-lKQERFGEdyBd9q9NMDXUQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_-lUBEBFGEdyBd9q9NMDXUQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -1777,8 +1777,8 @@
<generalization xmi:id="_YKYhUBFIEdyUJeMeN__D-A" general="_ACuvABD_EdyybZnLxHsjyA"/>
<generalization xmi:id="_x0Ww8EIlEd6dmI2dd6jVFQ" general="_DBKa8AnsEdy9WM11hWri2g"/>
<ownedAttribute xmi:id="_Asy1ghFIEdyUJeMeN__D-A" name="value" visibility="public" type="_DBKa8AnsEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Asy1gxFIEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Asy1hBFIEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Asy1gxFIEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Asy1hRFIEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1788,8 +1788,8 @@
<generalization xmi:id="_B5VngRFQEdyUJeMeN__D-A" general="_ACuvABD_EdyybZnLxHsjyA"/>
<generalization xmi:id="_yNJrcEIlEd6dmI2dd6jVFQ" general="_qZ3GUAnxEdy9WM11hWri2g"/>
<ownedAttribute xmi:id="_B5VnghFQEdyUJeMeN__D-A" name="value" visibility="public" type="_qZ3GUAnxEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_B5VngxFQEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_B5VnhBFQEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_B5VngxFQEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_B5VnhRFQEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1799,8 +1799,8 @@
<generalization xmi:id="_Yq-MQRFQEdyUJeMeN__D-A" general="_ACuvABD_EdyybZnLxHsjyA"/>
<generalization xmi:id="_yh2JEEIlEd6dmI2dd6jVFQ" general="_beo90AnpEdy9WM11hWri2g"/>
<ownedAttribute xmi:id="_Yq-MQhFQEdyUJeMeN__D-A" name="value" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yq-MQxFQEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yq-MRBFQEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yq-MQxFQEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Yq-MRRFQEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1810,8 +1810,8 @@
<generalization xmi:id="_0KWSgRFQEdyUJeMeN__D-A" general="_ACuvABD_EdyybZnLxHsjyA"/>
<generalization xmi:id="_w_JAMEIlEd6dmI2dd6jVFQ" general="_HJ1zcAnfEdy9WM11hWri2g"/>
<ownedAttribute xmi:id="_0KWSghFQEdyUJeMeN__D-A" name="value" visibility="public" type="_HJ1zcAnfEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0KWSgxFQEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0KWShBFQEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0KWSgxFQEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_0KWShRFQEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1821,8 +1821,8 @@
<generalization xmi:id="_NIDGMRFREdyUJeMeN__D-A" general="_ACuvABD_EdyybZnLxHsjyA"/>
<generalization xmi:id="_zLPEUEIlEd6dmI2dd6jVFQ" general="_sexkYAnxEdy9WM11hWri2g"/>
<ownedAttribute xmi:id="_NIDGMhFREdyUJeMeN__D-A" name="value" visibility="public" type="_sexkYAnxEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NIDGMxFREdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NIDGNBFREdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NIDGMxFREdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_NIDGNRFREdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1831,36 +1831,36 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_kMwX8BFREdyUJeMeN__D-A" name="NFP_Duration">
<generalization xmi:id="_kMwX8RFREdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_kMwX8hFREdyUJeMeN__D-A" name="unit" visibility="public" type="_Iaa3gA4yEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kMwX8xFREdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kMwX9BFREdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kMwX8xFREdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_kMwX9RFREdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_w72gwBFREdyUJeMeN__D-A" name="clock" visibility="public" type="_qZ3GUAnxEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z4f4EBFREdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z4WHEBFREdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_z4f4EBFREdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_z4ppEBFREdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_xIXSwBFREdyUJeMeN__D-A" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3PheQRFREdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3PheQBFREdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3PheQRFREdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_3PqoMBFREdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_60p4QBFZEdyUJeMeN__D-A" name="worst" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AEmeIDJQEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AETjMDJQEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AEmeIDJQEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_86duMBFZEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_AFWFADJQEd211cMdxu944g" name="best" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FA5ZADJQEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FAwPEDJQEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FA5ZADJQEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_FBDKADJQEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
@@ -1869,15 +1869,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="__NI1EBFREdyUJeMeN__D-A" name="NFP_DataTxRate">
<generalization xmi:id="_QFU6MBFSEdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_B7LvsBFSEdyUJeMeN__D-A" name="unit" visibility="public" type="_DyNg0A4zEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E9C-MBFSEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_E850QBFSEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E9C-MBFSEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_E9C-MRFSEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_F-6q4BFSEdyUJeMeN__D-A" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hd1f8RFSEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Hd1f8BFSEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Hd1f8RFSEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Hd-p4BFSEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1886,15 +1886,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_UDZSQBFSEdyUJeMeN__D-A" name="NFP_Frequency">
<generalization xmi:id="_UDZSQRFSEdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_UDZSQhFSEdyUJeMeN__D-A" name="unit" visibility="public" type="_qFaygA4yEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UDZSQxFSEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UDZSRBFSEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UDZSQxFSEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UDZSRRFSEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_UDZSRhFSEdyUJeMeN__D-A" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UDZSRxFSEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UDZSSBFSEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UDZSRxFSEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UDZSSRFSEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1903,15 +1903,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_nWsu8BFSEdyUJeMeN__D-A" name="NFP_Power">
<generalization xmi:id="_nWsu8RFSEdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_nWsu8hFSEdyUJeMeN__D-A" name="unit" visibility="public" type="_ijhHUA4yEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nWsu8xFSEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nWsu9BFSEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nWsu8xFSEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nWsu9RFSEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_nWsu9hFSEdyUJeMeN__D-A" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nWsu9xFSEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nWsu-BFSEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nWsu9xFSEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nWsu-RFSEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1920,15 +1920,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_5LrMcBFSEdyUJeMeN__D-A" name="NFP_DataSize">
<generalization xmi:id="_5LrMcRFSEdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_5LrMchFSEdyUJeMeN__D-A" name="unit" visibility="public" type="_2pVmEA4yEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5LrMcxFSEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5LrMdBFSEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5LrMcxFSEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5LrMdRFSEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_5LrMdhFSEdyUJeMeN__D-A" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5LrMdxFSEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5LrMeBFSEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5LrMdxFSEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5LrMeRFSEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1937,15 +1937,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_QmcNwBFTEdyUJeMeN__D-A" name="NFP_Energy">
<generalization xmi:id="_QmcNwRFTEdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_QmcNwhFTEdyUJeMeN__D-A" name="unit" visibility="public" type="_UaKKgA4zEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QmcNwxFTEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QmcNxBFTEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QmcNwxFTEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_QmcNxRFTEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_QmcNxhFTEdyUJeMeN__D-A" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QmcNxxFTEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QmcNyBFTEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QmcNxxFTEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_QmcNyRFTEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1954,15 +1954,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_g4VH4BFTEdyUJeMeN__D-A" name="NFP_Length">
<generalization xmi:id="_g4VH4RFTEdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_g4VH4hFTEdyUJeMeN__D-A" name="unit" visibility="public" type="_g5AQ0A4zEdysTsAUPnp57Q" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_g4VH4xFTEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_g4VH5BFTEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_g4VH4xFTEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_g4VH5RFTEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_g4VH5hFTEdyUJeMeN__D-A" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_g4VH5xFTEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_g4VH6BFTEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_g4VH5xFTEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_g4VH6RFTEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1971,15 +1971,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_0KmCwBFTEdyUJeMeN__D-A" name="NFP_Area">
<generalization xmi:id="_0KmCwRFTEdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_0KmCwhFTEdyUJeMeN__D-A" name="unit" visibility="public" type="_Sw5dsBFUEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0KmCwxFTEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0KmCxBFTEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0KmCwxFTEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_0KmCxRFTEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_0KmCxhFTEdyUJeMeN__D-A" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0KmCxxFTEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0KmCyBFTEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0KmCxxFTEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_0KmCyRFTEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -1987,47 +1987,47 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_VDec8BFXEdyUJeMeN__D-A" name="ArrivalPattern">
<ownedAttribute xmi:id="_3KX0UBFYEdyUJeMeN__D-A" name="periodic" visibility="public" type="_YOIbEBFXEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7VjbURFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7VjbUBFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7VjbURFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_7VtMUBFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_3OsToBFYEdyUJeMeN__D-A" name="aperiodic" visibility="public" type="_n4-jUBFXEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9wrZ8BFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9who8BFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9wrZ8BFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_9wrZ8RFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_3XCXUBFYEdyUJeMeN__D-A" name="burst" visibility="public" type="_LYgXABFYEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MUS0YBFZEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MUJDYBFZEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MUS0YBFZEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_MUS0YRFZEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_3bXdsBFYEdyUJeMeN__D-A" name="irregular" visibility="public" type="_iyYAcBFYEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UCa9sRFZEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UCa9sBFZEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UCa9sRFZEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_UCkHoBFZEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_3f1G8BFYEdyUJeMeN__D-A" name="closed" visibility="public" type="_xuG1YBFXEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V1dBkRFZEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V1dBkBFZEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V1dBkRFZEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_V1mykBFZEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_XSb88BFZEdyUJeMeN__D-A" name="sporadic" type="_69YoYBFXEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fG9pMRFZEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fG9pMBFZEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fG9pMRFZEdyUJeMeN__D-A" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:id="_PN-GcDJPEd211cMdxu944g" name="open" visibility="public" type="_cb3rIDJPEd211cMdxu944g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2970kDJPEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_29yDkDJPEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2970kDJPEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_2-FlkDJPEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
@@ -2035,29 +2035,29 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_YOIbEBFXEdyUJeMeN__D-A" name="PeriodicPattern">
<ownedAttribute xmi:id="_aP6soBFXEdyUJeMeN__D-A" name="period" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cwjdYBFXEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cwZsYBFXEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cwjdYBFXEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cwjdYRFXEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aVSU0BFXEdyUJeMeN__D-A" name="jitter" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fsm-0RFXEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fsm-0BFXEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fsm-0RFXEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_fswIwBFXEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aZdDIBFXEdyUJeMeN__D-A" name="phase" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hhbycRFXEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hhbycBFXEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hhbycRFXEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_hhk8YBFXEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_QZPmwDJPEd211cMdxu944g" name="occurrences" visibility="public" type="_0KWSgBFQEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VaUT8DJPEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VaKi8DJPEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VaUT8DJPEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_VanO4DJPEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
@@ -2065,8 +2065,8 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_n4-jUBFXEdyUJeMeN__D-A" name="AperiodicPattern">
<ownedAttribute xmi:id="_pZYmIBFXEdyUJeMeN__D-A" name="distribution" visibility="public" type="_ACuvABD_EdyybZnLxHsjyA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sI7VkRFXEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sI7VkBFXEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sI7VkRFXEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sJEfgBFXEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -2074,15 +2074,15 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_xuG1YBFXEdyUJeMeN__D-A" name="ClosedPattern">
<ownedAttribute xmi:id="_y5DlkBFXEdyUJeMeN__D-A" name="population" visibility="public" type="_0KWSgBFQEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_09YNwRFXEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_09YNwBFXEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_09YNwRFXEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_09h-wBFXEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_y-bNwBFXEdyUJeMeN__D-A" name="extDelay" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_32JxsRFXEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_32JxsBFXEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_32JxsRFXEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_32TisBFXEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -2091,22 +2091,22 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_69YoYBFXEdyUJeMeN__D-A" name="SporadicPattern">
<generalization xmi:id="_Jc-ecBFYEdyUJeMeN__D-A" general="_n4-jUBFXEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_9g_0oBFXEdyUJeMeN__D-A" name="minInterarrival" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BdHr8RFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BdHr8BFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BdHr8RFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_BdRc8BFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_9l6w4BFXEdyUJeMeN__D-A" name="maxInterarrival" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EtTDQBFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EtJSQBFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EtTDQBFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_EtTDQRFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_9qiLIBFXEdyUJeMeN__D-A" name="jitter" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G6tWABFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G6jlABFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G6tWABFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_G62f8BFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -2115,36 +2115,36 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_LYgXABFYEdyUJeMeN__D-A" name="BurstPattern">
<generalization xmi:id="_iSV1gBFYEdyUJeMeN__D-A" general="_n4-jUBFXEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_RuH1QBFYEdyUJeMeN__D-A" name="minInterarrival" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RuH1QRFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RuH1QhFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RuH1QRFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RuH1QxFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_RuH1RBFYEdyUJeMeN__D-A" name="maxInterarrival" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RuH1RRFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RuH1RhFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RuH1RRFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RuH1RxFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_WdqGgBFYEdyUJeMeN__D-A" name="minEventInterval" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZizSgBFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZiphgBFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZizSgBFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ZizSgRFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_aOdeoBFYEdyUJeMeN__D-A" name="maxEventInterval" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dEQAABFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dEG2EBFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dEQAABFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_dEQAARFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_d7PSYBFYEdyUJeMeN__D-A" name="burstSize" visibility="public" type="_0KWSgBFQEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gQZy8RFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gQZy8BFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gQZy8RFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_gQi84BFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -2153,15 +2153,15 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_iyYAcBFYEdyUJeMeN__D-A" name="IrregularPattern">
<generalization xmi:id="_wA6eUBFYEdyUJeMeN__D-A" general="_n4-jUBFXEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_l2xlkBFYEdyUJeMeN__D-A" name="phase" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oB8coRFYEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oB8coBFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oB8coRFYEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_oCGNoBFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_l-q9UBFYEdyUJeMeN__D-A" name="interarrivals" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sXaBABFYEdyUJeMeN__D-A" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sXQ3EBFYEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sXaBABFYEdyUJeMeN__D-A" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sXjyABFYEdyUJeMeN__D-A">
<value xsi:nil="true"/>
</defaultValue>
@@ -2170,30 +2170,30 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_ZPC-IBFaEdyUJeMeN__D-A" name="NFP_Percentage">
<generalization xmi:id="_qAhXQBFaEdyUJeMeN__D-A" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_bD3xwBFaEdyUJeMeN__D-A" name="unit" visibility="public" type="_qZ3GUAnxEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fNQpABFaEdyUJeMeN__D-A" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fNG4ABFaEdyUJeMeN__D-A"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fNQpABFaEdyUJeMeN__D-A" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_g8H-kBFaEdyUJeMeN__D-A" value="%"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_cb3rIDJPEd211cMdxu944g" name="OpenPattern">
<ownedAttribute xmi:id="_fPCWUDJPEd211cMdxu944g" name="interArrivalTime" visibility="public" type="_kMwX8BFREdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jCv4gDJPEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jCmHgDJPEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jCv4gDJPEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jC5pgDJPEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_fWC9QDJPEd211cMdxu944g" name="arrivalRate" visibility="public" type="_UDZSQBFSEdyUJeMeN__D-A" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nu8h4DJPEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nupm8DJPEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nu8h4DJPEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nvGS4DJPEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_fZU6wDJPEd211cMdxu944g" name="arrivalProcess" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rj2W4DJPEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rjtM8DJPEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rj2W4DJPEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_rkJR0DJPEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
@@ -2202,23 +2202,23 @@
<packagedElement xmi:type="uml:DataType" xmi:id="_TyXpQDJQEd211cMdxu944g" name="NFP_Price">
<generalization xmi:id="_qjjiEDJQEd211cMdxu944g" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_XPkv8DJQEd211cMdxu944g" name="unit" visibility="public" type="_qZ3GUAnxEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cDX2IDJQEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cDOsMDJQEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cDX2IDJQEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_cDhnIDJQEd211cMdxu944g" value="$US"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_sMCi0DJQEd211cMdxu944g" name="NFP_Weight">
<generalization xmi:id="_4gAj8DJSEd211cMdxu944g" general="_Yq-MQBFQEdyUJeMeN__D-A"/>
<ownedAttribute xmi:id="_0pa-0DJQEd211cMdxu944g" name="unit" visibility="public" type="_fuoVADJSEd211cMdxu944g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AjjOgDJREd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AjZdgDJREd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AjjOgDJREd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_6GXIoDJQEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_60bIgDJQEd211cMdxu944g" name="precision" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8u87gDJQEd211cMdxu944g" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8uzKgDJQEd211cMdxu944g"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8u87gDJQEd211cMdxu944g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_8vGFcDJQEd211cMdxu944g">
<value xsi:nil="true"/>
</defaultValue>
@@ -2276,29 +2276,29 @@
</ownedParameter>
</ownedTemplateSignature>
<ownedAttribute xmi:id="_WqAuwA9bEdyP5Zh6SHZeeg" name="unit" visibility="public" type="_JBiEkBgnEdyHL91mBnoLNQ" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y74qwQ9bEdyP5Zh6SHZeeg" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y74qwA9bEdyP5Zh6SHZeeg"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Y74qwQ9bEdyP5Zh6SHZeeg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Y8CbwA9bEdyP5Zh6SHZeeg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_E2_cQA9fEdy-lroUn0KWEw" name="value" visibility="public" type="_beo90AnpEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_K0mDIQ9fEdy-lroUn0KWEw" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_K0mDIA9fEdy-lroUn0KWEw"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_K0mDIQ9fEdy-lroUn0KWEw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_K0vNEA9fEdy-lroUn0KWEw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_cQrtcA-JEdyNj8xzjk-DoA" name="expr" visibility="public" type="_Y-aEYA-JEdyNj8xzjk-DoA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ekOdYQ-JEdyNj8xzjk-DoA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ekOdYA-JEdyNj8xzjk-DoA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ekOdYQ-JEdyNj8xzjk-DoA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_ekOdYg-JEdyNj8xzjk-DoA">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_cW8tgA-JEdyNj8xzjk-DoA" name="onClock" visibility="public" type="_qZ3GUAnxEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tkIVwQ-KEdyNj8xzjk-DoA" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tkIVwA-KEdyNj8xzjk-DoA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tkIVwQ-KEdyNj8xzjk-DoA" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_jObisg-JEdyNj8xzjk-DoA">
<value xsi:nil="true"/>
</defaultValue>
@@ -2346,22 +2346,22 @@
<packageImport xmi:id="_ZKGCQBmVEdyKYph7niDrbQ" importedPackage="_g2qR8A74EdyML4mHwjNDrw"/>
<packagedElement xmi:type="uml:DataType" xmi:id="_hwFnsBmVEdyKYph7niDrbQ" name="TilerSpecification">
<ownedAttribute xmi:id="_kL8mIBmVEdyKYph7niDrbQ" name="origin" visibility="public" type="_WkRCQBD_EdyybZnLxHsjyA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nsWKwBmVEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nsNA0BmVEdyKYph7niDrbQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nsWKwBmVEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_nsWKwRmVEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_kTPg8BmVEdyKYph7niDrbQ" name="paving" visibility="public" type="_yhmP0BD_EdyybZnLxHsjyA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_prv2sBmVEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_prmswBmVEdyKYph7niDrbQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_prv2sBmVEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_pr5nsBmVEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
<ownedAttribute xmi:id="_kWrPcBmVEdyKYph7niDrbQ" name="fitting" visibility="public" type="_WkRCQBD_EdyybZnLxHsjyA" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sk0VkBmVEdyKYph7niDrbQ" value="1"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_skqkkBmVEdyKYph7niDrbQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sk0VkBmVEdyKYph7niDrbQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sk9fgBmVEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -2369,8 +2369,8 @@
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_5jgZkBmVEdyKYph7niDrbQ" name="ShapeSpecification">
<ownedAttribute xmi:id="_8nS6sBmVEdyKYph7niDrbQ" name="size" visibility="public" type="_DBKa8AnsEdy9WM11hWri2g" isUnique="false">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__IEOUBmVEdyKYph7niDrbQ" value="*"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__H6dUBmVEdyKYph7niDrbQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__IEOUBmVEdyKYph7niDrbQ" value="*"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="__INYQBmVEdyKYph7niDrbQ">
<value xsi:nil="true"/>
</defaultValue>
@@ -2391,7 +2391,7 @@
</profileApplication>
<profileApplication xmi:id="_zZKzULGzEd-tmN4hwNCxXQ">
<eAnnotations xmi:id="_zZduQLGzEd-tmN4hwNCxXQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/schemas/Standard/1#/"/>
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
</eAnnotations>
<appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
</profileApplication>
@@ -2516,15 +2516,15 @@
<Ecore:EDataType xmi:id="_2kIJUJjOEd-m0Oaexd_lJA" instanceClassName="java.lang.String" base_PrimitiveType="_sexkYAnxEdy9WM11hWri2g"/>
<Ecore:EDataType xmi:id="_6fMQsJjOEd-m0Oaexd_lJA" instanceClassName="java.lang.String" base_PrimitiveType="_Y-aEYA-JEdyNj8xzjk-DoA"/>
<Ecore:EDataType xmi:id="__afGAJjOEd-m0Oaexd_lJA" instanceClassName="java.lang.String" base_PrimitiveType="_bManMBEBEdyx6M3BlUjlCQ"/>
- <Standard:ModelLibrary xmi:id="_z7_MgLGzEd-tmN4hwNCxXQ" base_Package="_uBlQkA73EdyML4mHwjNDrw"/>
- <Standard:ModelLibrary xmi:id="_0qR14LGzEd-tmN4hwNCxXQ" base_Package="_l6ms8A74EdyML4mHwjNDrw"/>
- <Standard:ModelLibrary xmi:id="_1SnBMLGzEd-tmN4hwNCxXQ" base_Package="_X3JtMAeNEdytasR0-Ec7ew"/>
- <Standard:ModelLibrary xmi:id="_2GZ1oLGzEd-tmN4hwNCxXQ" base_Package="_g2qR8A74EdyML4mHwjNDrw"/>
- <Standard:ModelLibrary xmi:id="_25v-ILGzEd-tmN4hwNCxXQ" base_Package="_dDxjEAeNEdytasR0-Ec7ew"/>
- <Standard:ModelLibrary xmi:id="_3ck-YLGzEd-tmN4hwNCxXQ" base_Package="_3DJKAA4uEdysTsAUPnp57Q"/>
- <Standard:ModelLibrary xmi:id="_4E6JsLGzEd-tmN4hwNCxXQ" base_Package="_RTwjABgzEdyHL91mBnoLNQ"/>
- <Standard:ModelLibrary xmi:id="_5Ou4gLGzEd-tmN4hwNCxXQ" base_Package="_2GPOEA74EdyML4mHwjNDrw"/>
- <Standard:ModelLibrary xmi:id="_50PZULGzEd-tmN4hwNCxXQ" base_Package="_x9l9sA74EdyML4mHwjNDrw"/>
+ <l2:ModelLibrary xmi:id="_z7_MgLGzEd-tmN4hwNCxXQ" base_Package="_uBlQkA73EdyML4mHwjNDrw"/>
+ <l2:ModelLibrary xmi:id="_0qR14LGzEd-tmN4hwNCxXQ" base_Package="_l6ms8A74EdyML4mHwjNDrw"/>
+ <l2:ModelLibrary xmi:id="_1SnBMLGzEd-tmN4hwNCxXQ" base_Package="_X3JtMAeNEdytasR0-Ec7ew"/>
+ <l2:ModelLibrary xmi:id="_2GZ1oLGzEd-tmN4hwNCxXQ" base_Package="_g2qR8A74EdyML4mHwjNDrw"/>
+ <l2:ModelLibrary xmi:id="_25v-ILGzEd-tmN4hwNCxXQ" base_Package="_dDxjEAeNEdytasR0-Ec7ew"/>
+ <l2:ModelLibrary xmi:id="_3ck-YLGzEd-tmN4hwNCxXQ" base_Package="_3DJKAA4uEdysTsAUPnp57Q"/>
+ <l2:ModelLibrary xmi:id="_4E6JsLGzEd-tmN4hwNCxXQ" base_Package="_RTwjABgzEdyHL91mBnoLNQ"/>
+ <l2:ModelLibrary xmi:id="_5Ou4gLGzEd-tmN4hwNCxXQ" base_Package="_2GPOEA74EdyML4mHwjNDrw"/>
+ <l2:ModelLibrary xmi:id="_50PZULGzEd-tmN4hwNCxXQ" base_Package="_x9l9sA74EdyML4mHwjNDrw"/>
<DataTypes:ChoiceType xmi:id="_m9Be4LG3Ed-tmN4hwNCxXQ" base_DataType="_HRbMoLGzEd-tmN4hwNCxXQ"/>
<DataTypes:TupleType xmi:id="_n59BMLG3Ed-tmN4hwNCxXQ" base_DataType="_LcrFELGzEd-tmN4hwNCxXQ"/>
<DataTypes:TupleType xmi:id="_o0Vl0LG3Ed-tmN4hwNCxXQ" base_DataType="_NxGl0LGzEd-tmN4hwNCxXQ"/>
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GQAMPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GQAMPackage.java
index 1482489a8cd..8cfef5486f2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GQAMPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GQAMPackage.java
@@ -18,11 +18,8 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaAnalysisContext.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaAnalysisContext.java
index 510d0d0e23d..09274823500 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaAnalysisContext.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaAnalysisContext.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaCommHost.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaCommHost.java
index 9efbdc520f4..4c18bbfdf6a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaCommHost.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaCommHost.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaEventTrace.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaEventTrace.java
index 10ff03eb88a..97788d1ae36 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaEventTrace.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaEventTrace.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaExecHost.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaExecHost.java
index 514e817978c..479be00be1c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaExecHost.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaExecHost.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaResourcesPlatform.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaResourcesPlatform.java
index 856e2723138..ade0f47dac6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaResourcesPlatform.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaResourcesPlatform.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
-
import org.eclipse.uml2.uml.Classifier;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaScenario.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaScenario.java
index cdd1dae6fb9..cbcd02a9e4d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaScenario.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaScenario.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaStep.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaStep.java
index ef98932240a..95b7771145d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaStep.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaStep.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaTimedObs.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaTimedObs.java
index 8ce1fce7046..232fa4298a0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaTimedObs.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaTimedObs.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.uml2.uml.TimeObservation;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadBehavior.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadBehavior.java
index 5c187d5bc62..3d560321632 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadBehavior.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadBehavior.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadEvent.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadEvent.java
index d8d44e7ea8b..6acee210627 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadEvent.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadEvent.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.TimeEvent;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadGenerator.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadGenerator.java
index f05a818f2c6..5a7a8005672 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadGenerator.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/GaWorkloadGenerator.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Behavior;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMFactoryImpl.java
index c3f747f331e..13da3ab7ba5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMFactoryImpl.java
@@ -17,12 +17,28 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.*;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMFactory;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAcqStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAnalysisContext;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommChannel;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaEventTrace;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaLatencyObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRelStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRequestedService;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaResourcesPlatform;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadEvent;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadGenerator;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.LaxityKind;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMPackageImpl.java
index 62f8c6bea02..87522677166 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GQAMPackageImpl.java
@@ -18,11 +18,8 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMFactory;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAcqStep;
@@ -43,143 +40,75 @@ import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadBehavior;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadEvent;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadGenerator;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.LaxityKind;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAcqStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAcqStepImpl.java
index 7f9316023b2..83d845df53b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAcqStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAcqStepImpl.java
@@ -14,15 +14,11 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAcqStep;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAnalysisContextImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAnalysisContextImpl.java
index 437b3ac5f7f..5725e6c1d2a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAnalysisContextImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaAnalysisContextImpl.java
@@ -16,27 +16,19 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAnalysisContext;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaResourcesPlatform;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadBehavior;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.ConfigurationImpl;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommChannelImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommChannelImpl.java
index 296c4ecdff7..98a7025fd61 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommChannelImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommChannelImpl.java
@@ -14,14 +14,10 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommChannel;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.SchedulableResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommHostImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommHostImpl.java
index 5357eaa33f6..0143bf70d46 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommHostImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommHostImpl.java
@@ -17,31 +17,23 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommHost;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.CommunicationMediaImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.SchedPolicyKind;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommStepImpl.java
index 9a90f336865..039fdf98fd0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaCommStepImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaEventTraceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaEventTraceImpl.java
index 774f473e6d2..e72650930f0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaEventTraceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaEventTraceImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaEventTrace;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaExecHostImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaExecHostImpl.java
index c2294bb8e07..95231bf5bca 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaExecHostImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaExecHostImpl.java
@@ -16,24 +16,17 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.SchedulerImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaLatencyObsImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaLatencyObsImpl.java
index d17f2f38d8b..2e354d057bc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaLatencyObsImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaLatencyObsImpl.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaLatencyObs;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRelStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRelStepImpl.java
index 4af0822b463..e4e1f78ac58 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRelStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRelStepImpl.java
@@ -14,15 +14,11 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRelStep;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRequestedServiceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRequestedServiceImpl.java
index d8825ed455e..48aa7663406 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRequestedServiceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaRequestedServiceImpl.java
@@ -14,15 +14,11 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRequestedService;
-
import org.eclipse.uml2.uml.Operation;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaResourcesPlatformImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaResourcesPlatformImpl.java
index 3f2123dd0d3..ef92e930d38 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaResourcesPlatformImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaResourcesPlatformImpl.java
@@ -16,22 +16,15 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaResourcesPlatform;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
-
import org.eclipse.uml2.uml.Classifier;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaScenarioImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaScenarioImpl.java
index affade3bf76..a2d72b5018e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaScenarioImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaScenarioImpl.java
@@ -17,32 +17,24 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadEvent;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.ResourceUsageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
-
import org.eclipse.uml2.uml.Action;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Event;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaStepImpl.java
index 97639a06844..3396ec2f00a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaStepImpl.java
@@ -17,23 +17,17 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRequestedService;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaTimedObsImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaTimedObsImpl.java
index 3df469b7bd9..a6952c96922 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaTimedObsImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaTimedObsImpl.java
@@ -16,21 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.LaxityKind;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NfpConstraintImpl;
-
import org.eclipse.uml2.uml.TimeObservation;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadBehaviorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadBehaviorImpl.java
index 6b41b5a9d15..3434253ef9a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadBehaviorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadBehaviorImpl.java
@@ -16,22 +16,16 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadBehavior;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadEvent;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadEventImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadEventImpl.java
index 8aeee59d757..2f3dcc72cfc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadEventImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadEventImpl.java
@@ -14,19 +14,15 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaEventTrace;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadEvent;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadGenerator;
-
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.TimeEvent;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadGeneratorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadGeneratorImpl.java
index b03336a2d7b..9c7d72c6e1b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadGeneratorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/impl/GaWorkloadGeneratorImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadGenerator;
-
import org.eclipse.uml2.uml.Behavior;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMAdapterFactory.java
index 208342b6e50..fa28c3f8583 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMAdapterFactory.java
@@ -15,17 +15,28 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAcqStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAnalysisContext;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommChannel;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaEventTrace;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaLatencyObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRelStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRequestedService;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaResourcesPlatform;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadEvent;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadGenerator;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
@@ -33,9 +44,7 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceFactoryImpl.java
index 6ddb64c3abe..393358a7f44 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceImpl.java
index 37f6973cc70..96bc4986d3b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMSwitch.java
index c02c3e9e5aa..6971f7e1f9a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMSwitch.java
@@ -17,13 +17,26 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAcqStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAnalysisContext;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommChannel;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaEventTrace;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaLatencyObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRelStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRequestedService;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaResourcesPlatform;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadEvent;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaWorkloadGenerator;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
@@ -31,9 +44,7 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMXMLProcessor.java
index adb077d7ea2..a6c89917464 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/GQAM/util/GQAMXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PAMPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PAMPackage.java
index f76e486882c..01c904b9ca7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PAMPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PAMPackage.java
@@ -17,9 +17,7 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaResPassStep.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaResPassStep.java
index 7f90e75986b..6e0acf0fee7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaResPassStep.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaResPassStep.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaRunTInstance.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaRunTInstance.java
index d04d76fbad7..81792e1557c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaRunTInstance.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaRunTInstance.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaStep.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaStep.java
index db29d4f12f4..9b8fde75fa3 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaStep.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/PaStep.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMFactoryImpl.java
index ed1f758e07d..7895ab3f649 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMFactoryImpl.java
@@ -16,12 +16,16 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.*;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMFactory;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaLogicalResource;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRequestedStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaResPassStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRunTInstance;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaStep;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMPackageImpl.java
index 1dfda574a73..5bc9c4cdcdf 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PAMPackageImpl.java
@@ -17,15 +17,10 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMFactory;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaCommStep;
@@ -34,139 +29,73 @@ import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRequestedStep;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaResPassStep;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRunTInstance;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaStep;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaCommStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaCommStepImpl.java
index 3de4220d801..51f74bdc148 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaCommStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaCommStepImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaCommStep;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaLogicalResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaLogicalResourceImpl.java
index e040940cf61..641e2fd151d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaLogicalResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaLogicalResourceImpl.java
@@ -14,14 +14,10 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaLogicalResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.ResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRequestedStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRequestedStepImpl.java
index efc71ab5419..a2f74436437 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRequestedStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRequestedStepImpl.java
@@ -14,18 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRequestedService;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRequestedStep;
-
import org.eclipse.uml2.uml.Operation;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaResPassStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaResPassStepImpl.java
index 1f1ba0453ff..3d487a016e8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaResPassStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaResPassStepImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GaStepImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaResPassStep;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRunTInstanceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRunTInstanceImpl.java
index fd67191dcfc..bc01524b029 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRunTInstanceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaRunTInstanceImpl.java
@@ -14,20 +14,14 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRunTInstance;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaStepImpl.java
index f6ca6c9d68d..ad954fd5c7d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/impl/PaStepImpl.java
@@ -16,20 +16,13 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GaStepImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaStep;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMAdapterFactory.java
index 6799526a946..3b85e3906a5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMAdapterFactory.java
@@ -15,21 +15,21 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRequestedService;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaLogicalResource;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRequestedStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaResPassStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRunTInstance;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaStep;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceFactoryImpl.java
index 145ccc8f44e..78cbb06ed1c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceImpl.java
index 3b3cd9574bb..623d1a4bafe 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMSwitch.java
index b5c17c1e6b8..3a3ac091052 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMSwitch.java
@@ -17,17 +17,19 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaRequestedService;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaLogicalResource;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRequestedStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaResPassStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaRunTInstance;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PaStep;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMXMLProcessor.java
index f907bfd2714..ef5c214a81e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/PAM/util/PAMXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SAMPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SAMPackage.java
index 2805863081a..af6e9fcae63 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SAMPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SAMPackage.java
@@ -18,9 +18,7 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaCommStep.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaCommStep.java
index 15650927d7e..f8779ccdcaa 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaCommStep.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaCommStep.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaEndtoEndFlow.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaEndtoEndFlow.java
index f52f41a0f8e..a7b344af51a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaEndtoEndFlow.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaEndtoEndFlow.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSchedObs.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSchedObs.java
index 34087dcd916..b515afb9a71 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSchedObs.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSchedObs.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSharedResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSharedResource.java
index 6a6a08df939..7462398e931 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSharedResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaSharedResource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaStep.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaStep.java
index cf70b5541d8..e3b6772d006 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaStep.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/SaStep.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMFactoryImpl.java
index 544772820f8..df0001a81da 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMFactoryImpl.java
@@ -17,12 +17,19 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.*;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.OptimallityCriterionKind;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMFactory;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaAnalysisContext;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaCommHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaEndtoEndFlow;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaExecHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSchedObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSharedResource;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaStep;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMPackageImpl.java
index 760c83b9eeb..aff81161b5f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SAMPackageImpl.java
@@ -14,25 +14,17 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.OptimallityCriterionKind;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMFactory;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
@@ -44,135 +36,71 @@ import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaExecHost;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSchedObs;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSharedResource;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaStep;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaAnalysisContextImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaAnalysisContextImpl.java
index 4be5d9397e0..e94ca52d8aa 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaAnalysisContextImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaAnalysisContextImpl.java
@@ -14,13 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GaAnalysisContextImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.OptimallityCriterionKind;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaAnalysisContext;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommHostImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommHostImpl.java
index d974861ee2c..7cf76aca41d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommHostImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommHostImpl.java
@@ -14,13 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GaCommHostImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaCommHost;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommStepImpl.java
index 31b46bdb241..0e1fa3339b9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaCommStepImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GaCommStepImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaCommStep;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaEndtoEndFlowImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaEndtoEndFlowImpl.java
index 566a9d6e041..25a16585bb2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaEndtoEndFlowImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaEndtoEndFlowImpl.java
@@ -16,23 +16,16 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaEndtoEndFlow;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaExecHostImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaExecHostImpl.java
index 6f8fcfc1d20..737c5031d4a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaExecHostImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaExecHostImpl.java
@@ -14,13 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GaExecHostImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaExecHost;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSchedObsImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSchedObsImpl.java
index 7a763381426..faaaac6bc3b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSchedObsImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSchedObsImpl.java
@@ -16,13 +16,9 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GaTimedObsImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSchedObs;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSharedResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSharedResourceImpl.java
index ac5fd46f4d7..6e366fa2bd5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSharedResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaSharedResourceImpl.java
@@ -16,18 +16,12 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSharedResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.MutualExclusionResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaStepImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaStepImpl.java
index b5cf610c95b..9ad1f9ee528 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaStepImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/impl/SaStepImpl.java
@@ -16,22 +16,15 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GaStepImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSharedResource;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaStep;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMAdapterFactory.java
index b94af5c0a91..f0c9c81be89 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMAdapterFactory.java
@@ -15,11 +15,8 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAnalysisContext;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommHost;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
@@ -27,13 +24,17 @@ import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaAnalysisContext;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaCommHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaEndtoEndFlow;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaExecHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSchedObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSharedResource;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaStep;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
@@ -41,9 +42,7 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceFactoryImpl.java
index c9f1ae58352..28874f32518 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceImpl.java
index 4eb6fc9ab9c..54ad4ba4f76 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMSwitch.java
index 7f7d2a82b34..54c7819af09 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMSwitch.java
@@ -17,7 +17,6 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaAnalysisContext;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommHost;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaCommStep;
@@ -25,13 +24,17 @@ import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaExecHost;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaScenario;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaStep;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GaTimedObs;
-
-import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaAnalysisContext;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaCommHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaCommStep;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaEndtoEndFlow;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaExecHost;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSchedObs;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaSharedResource;
+import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SaStep;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
@@ -39,9 +42,7 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMXMLProcessor.java
index 050a229496f..7423c8d461d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_AnalysisModel/SAM/util/SAMXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/LinkTopology.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/LinkTopology.java
index f3718def1ce..d841e432bfe 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/LinkTopology.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/LinkTopology.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Connector;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/RSMPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/RSMPackage.java
index b212262faa9..c3e3f54a9d8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/RSMPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/RSMPackage.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/Shaped.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/Shaped.java
index e4d6346f891..c08f251f3e7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/Shaped.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/Shaped.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.MultiplicityElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DefaultLinkImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DefaultLinkImpl.java
index b7382cfbe9d..18e598ff276 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DefaultLinkImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DefaultLinkImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.DefaultLink;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DistributeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DistributeImpl.java
index e2a5335dac1..46445770b6b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DistributeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/DistributeImpl.java
@@ -14,14 +14,10 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Distribute;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocateImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/InterRepetitionImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/InterRepetitionImpl.java
index 2df484a7343..b51238f796e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/InterRepetitionImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/InterRepetitionImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.InterRepetition;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/LinkTopologyImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/LinkTopologyImpl.java
index 2d0b0e66114..3dc01fc5eb6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/LinkTopologyImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/LinkTopologyImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.LinkTopology;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.uml2.uml.Connector;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMFactoryImpl.java
index 3e81eb568dc..7c2fcf3e0ec 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMFactoryImpl.java
@@ -16,12 +16,16 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.DefaultLink;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Distribute;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.InterRepetition;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Reshape;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Shaped;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Tiler;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMPackageImpl.java
index 4f5273f1452..af7e6a936ed 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/RSMPackageImpl.java
@@ -17,23 +17,14 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.DefaultLink;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Distribute;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.InterRepetition;
@@ -43,131 +34,69 @@ import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Reshape;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Shaped;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Tiler;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ReshapeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ReshapeImpl.java
index 0977f1eeffa..6bbbfd76682 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ReshapeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ReshapeImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Reshape;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ShapedImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ShapedImpl.java
index 3d5d4e3d8e8..841b8b162cc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ShapedImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/ShapedImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Shaped;
-
import org.eclipse.uml2.uml.MultiplicityElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/TilerImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/TilerImpl.java
index 9137530926c..01a7316e193 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/TilerImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/impl/TilerImpl.java
@@ -14,15 +14,11 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Tiler;
-
import org.eclipse.uml2.uml.ConnectorEnd;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMAdapterFactory.java
index 445f600bcb2..d3d6ece243e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMAdapterFactory.java
@@ -15,13 +15,16 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.DefaultLink;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Distribute;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.InterRepetition;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.LinkTopology;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Reshape;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Shaped;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Tiler;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceFactoryImpl.java
index 867b3ca59b1..07824d0ccff 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceImpl.java
index f40b6c6f2d6..3733e0dcb7f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMSwitch.java
index 68a0cbcfd9a..67c6645f0e9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMSwitch.java
@@ -17,9 +17,14 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.DefaultLink;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Distribute;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.InterRepetition;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.LinkTopology;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Reshape;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Shaped;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.Tiler;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMXMLProcessor.java
index 83418b996ca..7516026a947 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/RSM/util/RSMXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/BoundedSubtype.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/BoundedSubtype.java
index 2bffaa8acdc..725f7085578 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/BoundedSubtype.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/BoundedSubtype.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Property;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/ChoiceType.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/ChoiceType.java
index 4f8390a95ca..2e81022d550 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/ChoiceType.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/ChoiceType.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/CollectionType.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/CollectionType.java
index 18d18e87fe2..60a4db5c36d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/CollectionType.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/CollectionType.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/IntervalType.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/IntervalType.java
index b830761668f..f0f58db354c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/IntervalType.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/IntervalType.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/TupleType.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/TupleType.java
index 7f0fa8fef17..ea313363fc6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/TupleType.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/TupleType.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/BoundedSubtypeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/BoundedSubtypeImpl.java
index f19bd0d9e11..ee6240d9869 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/BoundedSubtypeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/BoundedSubtypeImpl.java
@@ -14,18 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.BoundedSubtype;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Property;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/ChoiceTypeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/ChoiceTypeImpl.java
index 40ab71964a1..9823aab0271 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/ChoiceTypeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/ChoiceTypeImpl.java
@@ -16,20 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.ChoiceType;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/CollectionTypeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/CollectionTypeImpl.java
index b8c73550542..acc8d66a441 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/CollectionTypeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/CollectionTypeImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.CollectionType;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesFactoryImpl.java
index 9a970d21b74..81e71dce917 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesFactoryImpl.java
@@ -16,12 +16,15 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.BoundedSubtype;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.ChoiceType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.CollectionType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.IntervalType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.TupleType;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesPackageImpl.java
index a3bf4054831..5d85015d3a0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/DataTypesPackageImpl.java
@@ -17,27 +17,16 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.BoundedSubtype;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.ChoiceType;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.CollectionType;
@@ -45,127 +34,67 @@ import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesFactory;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.IntervalType;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.TupleType;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/IntervalTypeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/IntervalTypeImpl.java
index 0a2c94273f8..350ebc65368 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/IntervalTypeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/IntervalTypeImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.IntervalType;
-
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/TupleTypeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/TupleTypeImpl.java
index f14646151c2..648d130c8ec 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/TupleTypeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/impl/TupleTypeImpl.java
@@ -16,20 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.TupleType;
-
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesAdapterFactory.java
index 8891f06685a..adb22e5bcf3 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesAdapterFactory.java
@@ -15,12 +15,14 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.BoundedSubtype;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.ChoiceType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.CollectionType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.IntervalType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.TupleType;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceFactoryImpl.java
index 3cdaf0ff4ee..df159b2fc2d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceImpl.java
index 4dbe40c220a..53c68c583f6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesSwitch.java
index 0d9eea85772..8092d768484 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesSwitch.java
@@ -17,8 +17,12 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.BoundedSubtype;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.ChoiceType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.CollectionType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.IntervalType;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.TupleType;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesXMLProcessor.java
index 9f8d717254e..93c754811dc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/DataTypes/util/DataTypesXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/Operator.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/Operator.java
index 81233e002a6..daf6b7fcbd2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/Operator.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/Operator.java
@@ -7,7 +7,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Behavior;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorImpl.java
index 0474be08506..535dfb0dbea 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorImpl.java
@@ -8,16 +8,12 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.Operator;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Parameter;
import org.eclipse.uml2.uml.ParameterDirectionKind;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsFactoryImpl.java
index c50dda2a8f3..f9451e4d9a2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsFactoryImpl.java
@@ -9,12 +9,11 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.Operator;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsPackageImpl.java
index 61f23d96b6c..a98fdff1708 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/impl/OperatorsPackageImpl.java
@@ -10,153 +10,80 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.Operator;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsFactory;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsAdapterFactory.java
index c101fc5f2c3..b69ed4e61fe 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsAdapterFactory.java
@@ -8,12 +8,10 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.Operator;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceFactoryImpl.java
index e7b62ec1345..aa4bea6b881 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceFactoryImpl.java
@@ -7,11 +7,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceImpl.java
index b56f4c6835e..4a24196d99d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsResourceImpl.java
@@ -7,7 +7,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsSwitch.java
index f6c0278f011..d8d524eab32 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsSwitch.java
@@ -10,8 +10,8 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.Operator;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsXMLProcessor.java
index 8422fe2b771..ac5bc274a55 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Operators/util/OperatorsXMLProcessor.java
@@ -9,11 +9,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/ExpressionContext.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/ExpressionContext.java
index b09baf35258..5d3e06d35a5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/ExpressionContext.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/ExpressionContext.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/Var.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/Var.java
index 6c3e6a93fc2..267ad5abe15 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/Var.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/Var.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/ExpressionContextImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/ExpressionContextImpl.java
index 069d0657e74..ffc2f7ca873 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/ExpressionContextImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/ExpressionContextImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VarImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VarImpl.java
index d6b3650bb2c..73c4fc7d182 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VarImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VarImpl.java
@@ -14,17 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.Var;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariableDirectionKind;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesFactoryImpl.java
index 87a819c3565..c0993c0fd21 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesFactoryImpl.java
@@ -17,12 +17,13 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.Var;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariableDirectionKind;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesPackageImpl.java
index a6095031671..dc012377817 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/impl/VariablesPackageImpl.java
@@ -18,31 +18,18 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
@@ -50,121 +37,63 @@ import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.Var;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariableDirectionKind;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesFactory;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesAdapterFactory.java
index e33609ad634..74817bff35b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesAdapterFactory.java
@@ -15,12 +15,11 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.Var;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceFactoryImpl.java
index 9da29d5b76c..4c2e703eeff 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceImpl.java
index b906d42cf34..555150b7a32 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesSwitch.java
index 071fbb41fde..812f0157312 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesSwitch.java
@@ -17,8 +17,9 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.*;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.ExpressionContext;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.Var;
+import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesXMLProcessor.java
index f419243edc1..2973f8a3efe 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Annexes/VSL/Variables/util/VariablesXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerFeature.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerFeature.java
index 235b74043ac..46c05f16987 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerFeature.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerFeature.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerPort.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerPort.java
index 96f941de7e9..a7025df1cc0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerPort.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerPort.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Interface;
import org.eclipse.uml2.uml.Port;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerSpecification.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerSpecification.java
index a57befda459..ad881adc0b1 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerSpecification.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/ClientServerSpecification.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Interface;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataEvent.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataEvent.java
index 9298b9ee99f..26736233471 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataEvent.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataEvent.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.AnyReceiveEvent;
import org.eclipse.uml2.uml.Classifier;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataPool.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataPool.java
index 51e7b9b3c7a..38663d91edc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataPool.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/DataPool.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowPort.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowPort.java
index 99c07ed06b7..06f43844059 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowPort.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowPort.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Port;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowProperty.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowProperty.java
index 7dad4993de4..7976a5ca777 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowProperty.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowProperty.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowSpecification.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowSpecification.java
index df186355d87..646df281139 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowSpecification.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/FlowSpecification.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Interface;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocatingBehavior.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocatingBehavior.java
index d2be2aaefb5..59ee437d9e9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocatingBehavior.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocatingBehavior.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Feature;
import org.eclipse.uml2.uml.InvocationAction;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocationAction.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocationAction.java
index 97db5985e67..c57c4ee4300 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocationAction.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMInvocationAction.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Feature;
import org.eclipse.uml2.uml.InvocationAction;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMTrigger.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMTrigger.java
index 880a65b3acb..b43579b4f3d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMTrigger.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/GCMTrigger.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Feature;
import org.eclipse.uml2.uml.Trigger;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerFeatureImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerFeatureImpl.java
index 17065fedc60..961dee7a3e1 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerFeatureImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerFeatureImpl.java
@@ -14,17 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerFeature;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerPortImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerPortImpl.java
index 8eaa24a6d48..ccfb8f3aaf9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerPortImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerPortImpl.java
@@ -16,25 +16,18 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerPort;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerSpecification;
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowDirectionKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.PortSpecificationKind;
import org.eclipse.papyrus.MARTE.utils.MarteResource;
-
import org.eclipse.uml2.uml.Image;
import org.eclipse.uml2.uml.Interface;
import org.eclipse.uml2.uml.Port;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerSpecificationImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerSpecificationImpl.java
index 3393a250245..3d5fa6c7727 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerSpecificationImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/ClientServerSpecificationImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerSpecification;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.uml2.uml.Interface;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataEventImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataEventImpl.java
index 54a937b6dbb..5becd49bb80 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataEventImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataEventImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataEvent;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.uml2.uml.AnyReceiveEvent;
import org.eclipse.uml2.uml.Classifier;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataPoolImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataPoolImpl.java
index c7a1ce7607e..6e9f1e781ad 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataPoolImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/DataPoolImpl.java
@@ -14,17 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataPool;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataPoolOrderingKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPortImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPortImpl.java
index 3d272f5b734..dabffcf74a8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPortImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPortImpl.java
@@ -14,20 +14,16 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowDirectionKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowPort;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowSpecification;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
import org.eclipse.papyrus.MARTE.utils.MarteResource;
import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
-
import org.eclipse.uml2.uml.Image;
import org.eclipse.uml2.uml.Port;
import org.eclipse.uml2.uml.Stereotype;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPropertyImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPropertyImpl.java
index 03689fb102c..1b1ce1a8bd0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPropertyImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowPropertyImpl.java
@@ -14,17 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowDirectionKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowProperty;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowSpecificationImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowSpecificationImpl.java
index f4770daf3ce..29d417ef7b0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowSpecificationImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/FlowSpecificationImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowSpecification;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.uml2.uml.Interface;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMFactoryImpl.java
index 0fe8b9137bd..999b6fce2b5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMFactoryImpl.java
@@ -17,12 +17,25 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerFeature;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerPort;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataEvent;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataPool;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataPoolOrderingKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowDirectionKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowPort;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowProperty;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocatingBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocationAction;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMTrigger;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.PortSpecificationKind;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocatingBehaviorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocatingBehaviorImpl.java
index 7dc521ad47e..5c0fe69b814 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocatingBehaviorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocatingBehaviorImpl.java
@@ -16,20 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocatingBehavior;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Feature;
import org.eclipse.uml2.uml.InvocationAction;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocationActionImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocationActionImpl.java
index 2363bf2be8f..b9bd2dfea32 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocationActionImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMInvocationActionImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocationAction;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.uml2.uml.Feature;
import org.eclipse.uml2.uml.InvocationAction;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMPackageImpl.java
index 7be8bf8a218..eafda2756d2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMPackageImpl.java
@@ -18,37 +18,22 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerFeature;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerPort;
@@ -66,117 +51,61 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocationAction;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMTrigger;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.PortSpecificationKind;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMTriggerImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMTriggerImpl.java
index ad63c228075..21e1c42cc5d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMTriggerImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/impl/GCMTriggerImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMTrigger;
-
import org.eclipse.uml2.uml.Feature;
import org.eclipse.uml2.uml.Trigger;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMAdapterFactory.java
index 66bebd8ee98..c9984f25d82 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMAdapterFactory.java
@@ -15,12 +15,20 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerFeature;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerPort;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataEvent;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataPool;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowPort;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowProperty;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocatingBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocationAction;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMTrigger;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceFactoryImpl.java
index 5cf45997399..3b1fd9ad56d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceImpl.java
index 4f345b31d9d..da9d402cd5a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMSwitch.java
index a3d4038cc8d..ebd39c87737 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMSwitch.java
@@ -17,8 +17,18 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerFeature;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerPort;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.ClientServerSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataEvent;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.DataPool;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowPort;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowProperty;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.FlowSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocatingBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMInvocationAction;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMTrigger;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMXMLProcessor.java
index 0d564740032..e07d6a352e8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/GCM/util/GCMXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/PpUnit.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/PpUnit.java
index b9400217c49..ae3fa5699b4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/PpUnit.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/PpUnit.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.BehavioredClassifier;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtAction.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtAction.java
index 579f255305d..94e16983e18 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtAction.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtAction.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.InvocationAction;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtFeature.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtFeature.java
index 93de5b7b3ad..5c356c1b165 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtFeature.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtFeature.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.InvocationAction;
import org.eclipse.uml2.uml.Message;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtService.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtService.java
index 5e7b91a4ee7..bdb17012041 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtService.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtService.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtSpecification.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtSpecification.java
index 88b21f03311..768912c485a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtSpecification.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtSpecification.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedInstantObservation;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Comment;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtUnit.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtUnit.java
index f8bbf341e1f..b7e2a6f73cb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtUnit.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/RtUnit.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.SchedPolicyKind;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.BehavioredClassifier;
import org.eclipse.uml2.uml.Operation;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMFactoryImpl.java
index f12d1ba3153..e93c983f461 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMFactoryImpl.java
@@ -17,12 +17,21 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.CallConcurrencyKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.ConcurrencyKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.ExecutionKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.PoolMgtPolicyKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.PpUnit;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtAction;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtFeature;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtService;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtUnit;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.SynchronizationKind;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMPackageImpl.java
index b32ee9dce46..dbc18fbf0b5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/HLAMPackageImpl.java
@@ -14,47 +14,29 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.CallConcurrencyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.ConcurrencyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.ExecutionKind;
@@ -68,113 +50,59 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtService;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtSpecification;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtUnit;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.SynchronizationKind;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/PpUnitImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/PpUnitImpl.java
index 8b3ff3e7b14..d32d5140d64 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/PpUnitImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/PpUnitImpl.java
@@ -14,17 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.CallConcurrencyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.PpUnit;
-
import org.eclipse.uml2.uml.BehavioredClassifier;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtActionImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtActionImpl.java
index 9e423bb57b1..acc2bb25b38 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtActionImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtActionImpl.java
@@ -14,17 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtAction;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.SynchronizationKind;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.InvocationAction;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtFeatureImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtFeatureImpl.java
index 73bd69bf34e..9b47b19f7c9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtFeatureImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtFeatureImpl.java
@@ -17,22 +17,17 @@ import java.util.Collection;
import java.util.Iterator;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.BasicInternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtFeature;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtSpecification;
import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.InvocationAction;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtServiceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtServiceImpl.java
index 30b29fb17be..be5b338966a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtServiceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtServiceImpl.java
@@ -14,19 +14,15 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.ConcurrencyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.ExecutionKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtService;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.SynchronizationKind;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtSpecificationImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtSpecificationImpl.java
index 89f2d7626c7..6489904a819 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtSpecificationImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtSpecificationImpl.java
@@ -14,18 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtSpecification;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedInstantObservation;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Comment;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtUnitImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtUnitImpl.java
index c84193b1faf..702c9aca1d9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtUnitImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/impl/RtUnitImpl.java
@@ -14,19 +14,14 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.PoolMgtPolicyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtUnit;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.SchedPolicyKind;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.BehavioredClassifier;
import org.eclipse.uml2.uml.Operation;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMAdapterFactory.java
index 467f6c30d7c..9b794d8d0b2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMAdapterFactory.java
@@ -15,12 +15,15 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.PpUnit;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtAction;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtFeature;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtService;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtUnit;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceFactoryImpl.java
index ffe8f3c4915..01ff719f914 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceImpl.java
index 6a79287da17..f01e2e62fd9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMSwitch.java
index 0f44ce50a4c..e3f3d2040c0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMSwitch.java
@@ -17,8 +17,13 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.PpUnit;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtAction;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtFeature;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtService;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtSpecification;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.RtUnit;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMXMLProcessor.java
index dd4ed64b019..4d519bc8587 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HLAM/util/HLAMXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java
index 53d4e272141..d57de5fd23f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwGeneralPackage.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java
index 437ce7f8dca..0a59c97eaad 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/HwResource.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwEndPoint;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralFactoryImpl.java
index 036f2ac8840..db18317b09a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralFactoryImpl.java
@@ -16,12 +16,12 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java
index 024a39648db..ee0dbd866e5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwGeneralPackageImpl.java
@@ -14,157 +14,85 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralFactory;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java
index 0630eebf1a8..48c4700605b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceImpl.java
@@ -17,24 +17,17 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwEndPoint;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.ResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceServiceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceServiceImpl.java
index 7ea597ca626..c7dfc895a67 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceServiceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/impl/HwResourceServiceImpl.java
@@ -14,14 +14,10 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GrServiceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralAdapterFactory.java
index 648f00f82df..8a1a203768a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralAdapterFactory.java
@@ -15,13 +15,11 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceFactoryImpl.java
index 428cae69f71..4422fcff170 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceImpl.java
index eaa7fe3ad10..84abbea5e22 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralSwitch.java
index 0efd752059c..88a2686225b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralSwitch.java
@@ -17,9 +17,9 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralXMLProcessor.java
index 8044eec8d8f..c920899acef 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwGeneral/util/HwGeneralXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java
index 24a3cb06df0..6d1d57091a0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwCommunicationPackage.java
@@ -17,9 +17,7 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwEndPoint.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwEndPoint.java
index 1ae6e3afd9d..ee231115f6d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwEndPoint.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwEndPoint.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwMedia.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwMedia.java
index 6e63abf4587..4f7aeac8887 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwMedia.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/HwMedia.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwArbiterImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwArbiterImpl.java
index c3c0b93679a..bd033230f2d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwArbiterImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwArbiterImpl.java
@@ -16,15 +16,11 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunicatio
import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBridgeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBridgeImpl.java
index 4b95a52d1e7..3573892772a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBridgeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBridgeImpl.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunicatio
import java.util.Collection;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBridge;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBusImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBusImpl.java
index de7c22c2f69..b64e3f9280b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBusImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwBusImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBus;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationFactoryImpl.java
index dcc804f6d8f..600aaa73142 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationFactoryImpl.java
@@ -16,12 +16,16 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunicatio
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBridge;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBus;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwEndPoint;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationPackageImpl.java
index 307de031b50..09b05f72eef 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationPackageImpl.java
@@ -17,49 +17,28 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBridge;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBus;
@@ -68,105 +47,55 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwEndPoint;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationResourceImpl.java
index b20f1ef9eb9..ef887ba6e1b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwCommunicationResourceImpl.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwEndPointImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwEndPointImpl.java
index 83508faaab3..2680d4cc8c5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwEndPointImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwEndPointImpl.java
@@ -16,19 +16,13 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunicatio
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwEndPoint;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java
index d263097a192..13a89d0aef0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/impl/HwMediaImpl.java
@@ -17,29 +17,22 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwEndPoint;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.CommunicationMediaImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationAdapterFactory.java
index 498dc844525..ea6a8252302 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationAdapterFactory.java
@@ -15,15 +15,16 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunicatio
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBridge;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBus;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwEndPoint;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceFactoryImpl.java
index 6e1ef87244e..ef26f51ff23 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceImpl.java
index 10a7966b596..064b6eb4765 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationSwitch.java
index 6ef392260f2..5b166b6896a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationSwitch.java
@@ -17,11 +17,14 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBridge;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwBus;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwEndPoint;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationXMLProcessor.java
index 5c4da24cea5..c1a92ac1aac 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwCommunication/util/HwCommunicationXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunicatio
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java
index 3b088665079..c1536749d11 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingPackage.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingResource.java
index 59c3b891929..3f1db3a9f64 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwComputingResource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwPLD.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwPLD.java
index aac333517ec..63752af8be7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwPLD.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwPLD.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwRAM;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwProcessor.java
index 50d2b065159..4084aff2e34 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/HwProcessor.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwMMU;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwASICImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwASICImpl.java
index 9738b474d5c..3280c822f59 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwASICImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwASICImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwASIC;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwBranchPredictorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwBranchPredictorImpl.java
index f5fbe62355c..614e2471ea9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwBranchPredictorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwBranchPredictorImpl.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwBranchPredictor;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingFactoryImpl.java
index b46021e6f77..315b9bc76fd 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingFactoryImpl.java
@@ -17,12 +17,19 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwASIC;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwBranchPredictor;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwISA;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwPLD;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwProcessor;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.ISA_Type;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.PLD_Class;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.PLD_Technology;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingPackageImpl.java
index cc0dc367da4..01efd286916 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingPackageImpl.java
@@ -14,60 +14,36 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwASIC;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwBranchPredictor;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingFactory;
@@ -79,101 +55,53 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwP
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.ISA_Type;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.PLD_Class;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.PLD_Technology;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingResourceImpl.java
index 49e6327eb72..d031840cc12 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwComputingResourceImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwISAImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwISAImpl.java
index 87b784ddd0b..0aa33e3a129 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwISAImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwISAImpl.java
@@ -14,13 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwISA;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.ISA_Type;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwPLDImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwPLDImpl.java
index e627c5d91ea..3c5fbb7dfa3 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwPLDImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwPLDImpl.java
@@ -16,20 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.im
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwPLD;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.PLD_Technology;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwRAM;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwProcessorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwProcessorImpl.java
index 1489aefb6f1..cac6ecf01d4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwProcessorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/impl/HwProcessorImpl.java
@@ -17,22 +17,15 @@ import java.util.Collection;
import java.util.Iterator;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwBranchPredictor;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwISA;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwMMU;
import org.eclipse.papyrus.MARTE.utils.MarteUtils;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingAdapterFactory.java
index 338e3d7c12c..bceb9c6f807 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingAdapterFactory.java
@@ -15,15 +15,16 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.ut
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwASIC;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwBranchPredictor;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwISA;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwPLD;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwProcessor;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceFactoryImpl.java
index b61ff248b51..abf59288d66 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceImpl.java
index be8e94e1bc6..1feb80db513 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingSwitch.java
index dfd0ce92d66..6d296ae69ba 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingSwitch.java
@@ -17,11 +17,14 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwASIC;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwBranchPredictor;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwISA;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwPLD;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwProcessor;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingXMLProcessor.java
index 386ff3eb880..c748bd3ea4a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwComputing/util/HwComputingXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.ut
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevice.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevice.java
index 6ab15cbe06d..9d8189ec5cf 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevice.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevice.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.DeviceResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java
index ed9bd9788a4..29447c18bde 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/HwDevicePackage.java
@@ -15,7 +15,6 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWActuatorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWActuatorImpl.java
index 8b72d995745..c75ff7a96eb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWActuatorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWActuatorImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWActuator;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWSensorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWSensorImpl.java
index 0ac111f66c4..06b2a8c04f2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWSensorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HWSensorImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWSensor;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceFactoryImpl.java
index 3bc8277366a..028034aa4ef 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceFactoryImpl.java
@@ -16,12 +16,15 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWActuator;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWSensor;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevice;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDeviceFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwI_O;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwSupport;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceImpl.java
index 37ec5661ba7..a11cc314275 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDeviceImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevice;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.DeviceResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDevicePackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDevicePackageImpl.java
index a88432d7103..4500056c7ba 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDevicePackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwDevicePackageImpl.java
@@ -15,57 +15,32 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWActuator;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWSensor;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevice;
@@ -73,97 +48,51 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevi
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwI_O;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwSupport;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwI_OImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwI_OImpl.java
index 3b18f89079d..4d7452177f4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwI_OImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwI_OImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwI_O;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwSupportImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwSupportImpl.java
index 7faf529f3b6..165b5c2a1ce 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwSupportImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/impl/HwSupportImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwSupport;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceAdapterFactory.java
index 0b210061cb0..11414dd72a7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceAdapterFactory.java
@@ -15,15 +15,15 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWActuator;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWSensor;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevice;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwI_O;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwSupport;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.DeviceResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceFactoryImpl.java
index d263715e5c9..bcb60569e07 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceImpl.java
index aecd9bf354d..6fd9292eaff 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceSwitch.java
index cfbafc78dd6..f77caeec2ae 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceSwitch.java
@@ -17,11 +17,13 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWActuator;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HWSensor;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevice;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwI_O;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwSupport;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.DeviceResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceXMLProcessor.java
index e551058285a..d9698445ccd 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwDevice/util/HwDeviceXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemory.java
index 0060eded90d..db15135f8bb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemory.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java
index f9913550530..6ea900eeb9d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/HwMemoryPackage.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwCacheImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwCacheImpl.java
index 07acbe87eb3..c5d021e5403 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwCacheImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwCacheImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.CacheType;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwDriveImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwDriveImpl.java
index 69ffc8428f2..716cfa26bd3 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwDriveImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwDriveImpl.java
@@ -14,12 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwDrive;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwRAM;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryFactoryImpl.java
index f816b46cdfa..8eba3115768 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryFactoryImpl.java
@@ -17,12 +17,19 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.CacheType;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwDrive;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwRAM;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwROM;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.ROM_Type;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.Repl_Policy;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.WritePolicy;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryImpl.java
index bc644a0be6b..69c871cf404 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryImpl.java
@@ -16,20 +16,13 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMe
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemory;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryPackageImpl.java
index 1465509b934..b95b52da281 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwMemoryPackageImpl.java
@@ -14,68 +14,40 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.CacheType;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwDrive;
@@ -87,93 +59,49 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMem
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.ROM_Type;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.Repl_Policy;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.WritePolicy;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwRAMImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwRAMImpl.java
index ef5836c761e..093d6fbdb8f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwRAMImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwRAMImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwRAM;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.Repl_Policy;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwROMImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwROMImpl.java
index 2efa6a4466d..c3b8c9f4431 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwROMImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/impl/HwROMImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwROM;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.ROM_Type;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryAdapterFactory.java
index edcfaac7f36..baca715357d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryAdapterFactory.java
@@ -15,15 +15,15 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMe
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwDrive;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwRAM;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwROM;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceFactoryImpl.java
index 24f6ec7442d..4797c31b139 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceImpl.java
index 80d6facdfef..5489472f8b9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemorySwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemorySwitch.java
index 40f0824b8db..06c18f42f98 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemorySwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemorySwitch.java
@@ -17,11 +17,13 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwDrive;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwRAM;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwROM;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryXMLProcessor.java
index c5e74fb2e5c..73ee9eb5930 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwMemory/util/HwMemoryXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMe
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwDMA.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwDMA.java
index a9ef5c9507b..6fc98f5196c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwDMA.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwDMA.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwProcessor;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwMMU.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwMMU.java
index 71f1cf868ae..9eabd9c4e23 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwMMU.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwMMU.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManager.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManager.java
index 5f1e8451e93..354db892717 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManager.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManager.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemory;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java
index bd073064ec7..ed7c452b296 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/HwStorageManagerPackage.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwDMAImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwDMAImpl.java
index b3f9242e5f9..d03de53a784 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwDMAImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwDMAImpl.java
@@ -17,25 +17,18 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwMedia;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwDMA;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwMMUImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwMMUImpl.java
index 80edfeb707c..239654e9897 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwMMUImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwMMUImpl.java
@@ -16,17 +16,11 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwSt
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwCache;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwMMU;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerFactoryImpl.java
index b86a3e17332..b01368cec27 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerFactoryImpl.java
@@ -16,12 +16,13 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwSt
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwDMA;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwMMU;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManager;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerImpl.java
index 35a1a65a4fd..b376b3f8e6f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerImpl.java
@@ -16,22 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwSt
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemory;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManager;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerPackageImpl.java
index a9484bb5f6d..57f4288cbd3 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/impl/HwStorageManagerPackageImpl.java
@@ -14,158 +14,86 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwDMA;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwMMU;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManager;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerFactory;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerAdapterFactory.java
index 14ccf5fe581..3dbc1432fa2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerAdapterFactory.java
@@ -15,18 +15,15 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwSt
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwDMA;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwMMU;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManager;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceFactoryImpl.java
index 29683dcef63..39d6b100625 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceImpl.java
index ca143c3ed58..1be5e9b7feb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerSwitch.java
index 252d8f5c54e..c385a34943c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerSwitch.java
@@ -17,14 +17,13 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwArbiter;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwDMA;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwMMU;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManager;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerXMLProcessor.java
index 19f798278fe..35c92048774 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwStorage/HwStorageManager/util/HwStorageManagerXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwSt
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java
index 91f87650af2..11244e1f761 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingPackage.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingResource.java
index dec476270f8..7cfcabe8b45 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/HwTimingResource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimingResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwClockImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwClockImpl.java
index b38b9014c92..55205841454 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwClockImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwClockImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwClock;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimerImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimerImpl.java
index 6adbfb08693..152bfa1da57 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimerImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimerImpl.java
@@ -14,12 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwClock;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimer;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingFactoryImpl.java
index 83dec86785e..d7061f00116 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingFactoryImpl.java
@@ -16,12 +16,13 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwClock;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimer;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingResource;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingPackageImpl.java
index 30df6c4fdac..75ccdae7a4d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingPackageImpl.java
@@ -17,153 +17,82 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwClock;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimer;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingFactory;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingResourceImpl.java
index 78378ea8773..4b8980e4d2b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/impl/HwTimingResourceImpl.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingAdapterFactory.java
index 7c413527eab..e487d99df5a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingAdapterFactory.java
@@ -15,15 +15,13 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwClock;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimer;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceFactoryImpl.java
index 383464a0e19..aea166851da 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceImpl.java
index 36bba91a0a0..c98ca9fc73f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingSwitch.java
index 80ce7b6c333..727ad15c8b4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingSwitch.java
@@ -17,11 +17,11 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwClock;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimer;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingXMLProcessor.java
index bf12d838f03..a80461ccd1e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwLogical/HwTiming/util/HwTimingXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwComponent.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwComponent.java
index b6207b4f669..f3be24c7ef6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwComponent.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwComponent.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java
index a498d6d2150..b395949fde6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/HwLayoutPackage.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwComponentImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwComponentImpl.java
index 002a477bdc0..be5d9db2488 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwComponentImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwComponentImpl.java
@@ -17,23 +17,16 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResourceService;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwResourceImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.ComponentKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwComponent;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutFactoryImpl.java
index 55165af11d6..a5c0334d441 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutFactoryImpl.java
@@ -17,12 +17,14 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.ComponentKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.ComponentState;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.ConditionType;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwComponent;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutPackageImpl.java
index bbf1d5fbbb5..cd393bb2379 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/impl/HwLayoutPackageImpl.java
@@ -14,161 +14,89 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.ComponentKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.ComponentState;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.ConditionType;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwComponent;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutFactory;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutAdapterFactory.java
index 2ed2262ff65..4332689a7a2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutAdapterFactory.java
@@ -15,15 +15,11 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.util
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwComponent;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceFactoryImpl.java
index fd23084da15..987e7b57ffb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceImpl.java
index f47669c1abb..a009777a338 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutSwitch.java
index b0eff91eade..9edeb183c00 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutSwitch.java
@@ -17,11 +17,9 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwComponent;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutXMLProcessor.java
index c739e982c2b..b1dfbb25a05 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwLayout/util/HwLayoutXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.util
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java
index 3ac5d7145e9..ce5b361fc62 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/HwPowerPackage.java
@@ -16,7 +16,6 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwCoolingSupplyImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwCoolingSupplyImpl.java
index 1c24a94b166..ddc7defdfbf 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwCoolingSupplyImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwCoolingSupplyImpl.java
@@ -14,13 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwComponentImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwCoolingSupply;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerFactoryImpl.java
index 0f05c87e4bd..fb0f9924001 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerFactoryImpl.java
@@ -16,12 +16,12 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwCoolingSupply;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerSupply;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerPackageImpl.java
index 5da7a4a96a5..344b9d1952b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerPackageImpl.java
@@ -16,152 +16,81 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwCoolingSupply;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerFactory;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerSupply;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerSupplyImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerSupplyImpl.java
index 07e6556fb2a..baf6de5c4e8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerSupplyImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/impl/HwPowerSupplyImpl.java
@@ -14,13 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwComponentImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerSupply;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerAdapterFactory.java
index bd9289d2bd5..cc85eb38b09 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerAdapterFactory.java
@@ -15,17 +15,13 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwComponent;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwCoolingSupply;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerSupply;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceFactoryImpl.java
index 548fbbf7d2e..e68f53f35ab 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceImpl.java
index da164ce98af..d9c7d385ecc 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerSwitch.java
index 293a8b65bc8..2af337430c8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerSwitch.java
@@ -17,13 +17,11 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwComponent;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwCoolingSupply;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerSupply;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerXMLProcessor.java
index 5dc2b1aaa63..a0589f873e6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/HRM/HwPhysical/HwPower/util/HwPowerXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/DeviceBroker.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/DeviceBroker.java
index beca42d7b7e..aae6db0bb02 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/DeviceBroker.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/DeviceBroker.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/MemoryBroker.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/MemoryBroker.java
index 430ed216e36..4e86094b4b7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/MemoryBroker.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/MemoryBroker.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/SW_BrokeringPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/SW_BrokeringPackage.java
index ed0bfba7dc2..acf5d4f1049 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/SW_BrokeringPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/SW_BrokeringPackage.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/DeviceBrokerImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/DeviceBrokerImpl.java
index 9128f92ad10..be3839c9e9e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/DeviceBrokerImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/DeviceBrokerImpl.java
@@ -16,21 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.AccessPolicyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.DeviceBroker;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SwResourceImpl;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/MemoryBrokerImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/MemoryBrokerImpl.java
index c0cb07e6870..3f5741474c8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/MemoryBrokerImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/MemoryBrokerImpl.java
@@ -16,21 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.AccessPolicyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.MemoryBroker;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SwResourceImpl;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringFactoryImpl.java
index 44a525113c0..1019c463adb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringFactoryImpl.java
@@ -17,12 +17,13 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.AccessPolicyKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.DeviceBroker;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.MemoryBroker;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringPackageImpl.java
index fbaa1eafa2d..1fe55d97907 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/impl/SW_BrokeringPackageImpl.java
@@ -18,153 +18,82 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.AccessPolicyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.DeviceBroker;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.MemoryBroker;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringFactory;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringAdapterFactory.java
index 0bf0ff05159..6bf26c4677b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringAdapterFactory.java
@@ -15,15 +15,12 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.DeviceBroker;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.MemoryBroker;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceFactoryImpl.java
index 4a7ec47eb1d..328fef8e3cf 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceImpl.java
index 611b301b8c9..09187314d42 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringSwitch.java
index 31e455df020..6a640e57974 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringSwitch.java
@@ -17,11 +17,10 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.DeviceBroker;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.MemoryBroker;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringXMLProcessor.java
index d60e5e6d47c..e001cc49e67 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Brokering/util/SW_BrokeringXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/Alarm.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/Alarm.java
index af0787e4d19..7e5b2e0586d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/Alarm.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/Alarm.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.uml2.uml.TypedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/EntryPoint.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/EntryPoint.java
index 22f853ea11f..abd4d407c31 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/EntryPoint.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/EntryPoint.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/InterruptResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/InterruptResource.java
index d3fec5f2948..a952a0369ef 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/InterruptResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/InterruptResource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/MemoryPartition.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/MemoryPartition.java
index cc7e535bdce..713183dee9e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/MemoryPartition.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/MemoryPartition.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Namespace;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SW_ConcurrencyPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SW_ConcurrencyPackage.java
index a922244cc85..faca8ed36b1 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SW_ConcurrencyPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SW_ConcurrencyPackage.java
@@ -18,11 +18,8 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwConcurrentResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwConcurrentResource.java
index 2edc971ad49..86c13647f8e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwConcurrentResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwConcurrentResource.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwSchedulableResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwSchedulableResource.java
index a478b8b6e8c..3592313eb64 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwSchedulableResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwSchedulableResource.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwTimerResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwTimerResource.java
index 3e03d19d88c..79b96c6c40f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwTimerResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/SwTimerResource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimerResource;
-
import org.eclipse.uml2.uml.TypedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/AlarmImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/AlarmImpl.java
index 760a26049fd..7a87cc6bf09 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/AlarmImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/AlarmImpl.java
@@ -16,18 +16,12 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.Alarm;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.uml2.uml.TypedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/EntryPointImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/EntryPointImpl.java
index 6ef402e3c61..60d4fc5c8ec 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/EntryPointImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/EntryPointImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.EntryPoint;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocateImpl;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/InterruptResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/InterruptResourceImpl.java
index a5e443c59a8..7550ed2fcf1 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/InterruptResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/InterruptResourceImpl.java
@@ -16,19 +16,13 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.InterruptKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.InterruptResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/MemoryPartitionImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/MemoryPartitionImpl.java
index aa7f968c3bd..7d766fac9e8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/MemoryPartitionImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/MemoryPartitionImpl.java
@@ -16,21 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.MemoryPartition;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SwResourceImpl;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Namespace;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyFactoryImpl.java
index dcfab1e6bc9..ee91d387484 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyFactoryImpl.java
@@ -17,12 +17,17 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.Alarm;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.EntryPoint;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.InterruptKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.InterruptResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.MemoryPartition;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwTimerResource;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyPackageImpl.java
index 8ceaaeaa2d5..66f6810532c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SW_ConcurrencyPackageImpl.java
@@ -14,91 +14,51 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.Alarm;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.EntryPoint;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.InterruptKind;
@@ -109,69 +69,37 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_Concurr
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwConcurrentResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwTimerResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwConcurrentResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwConcurrentResourceImpl.java
index 2e597402523..4b133f5d0de 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwConcurrentResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwConcurrentResourceImpl.java
@@ -16,20 +16,13 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwConcurrentResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SwResourceImpl;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwSchedulableResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwSchedulableResourceImpl.java
index 50820734fe7..e03a2dab105 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwSchedulableResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwSchedulableResourceImpl.java
@@ -17,25 +17,18 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SecondaryScheduler;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwTimerResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwTimerResourceImpl.java
index 73c29fdc844..e2cc9399f24 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwTimerResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/impl/SwTimerResourceImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwTimerResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.TimerResourceImpl;
-
import org.eclipse.uml2.uml.TypedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyAdapterFactory.java
index ff2c07ddff7..9378d6c8706 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyAdapterFactory.java
@@ -15,17 +15,18 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.Alarm;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.EntryPoint;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.InterruptResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.MemoryPartition;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwConcurrentResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwTimerResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimerResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceFactoryImpl.java
index 7da7f2995e3..0bae04debe2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceImpl.java
index b832122d9b2..3efda0bb634 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencySwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencySwitch.java
index 4dcb8a875ea..1898a660d95 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencySwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencySwitch.java
@@ -17,13 +17,16 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.Alarm;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.EntryPoint;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.InterruptResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.MemoryPartition;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwConcurrentResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwTimerResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimerResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyXMLProcessor.java
index 73cb7d66155..251e2e395c4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Concurrency/util/SW_ConcurrencyXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/MessageComResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/MessageComResource.java
index 4d24aac1ec0..1ae276f1955 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/MessageComResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/MessageComResource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/NotificationResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/NotificationResource.java
index e2fc0bc1e2b..f3b065d9c40 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/NotificationResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/NotificationResource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SW_InteractionPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SW_InteractionPackage.java
index 45f63ab831b..33b75d5d565 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SW_InteractionPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SW_InteractionPackage.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SharedDataComResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SharedDataComResource.java
index 35bce2ebb41..e31e536aa5e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SharedDataComResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SharedDataComResource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwInteractionResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwInteractionResource.java
index 6394ee38916..97873c38ac1 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwInteractionResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwInteractionResource.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.uml2.uml.TypedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwMutualExclusionResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwMutualExclusionResource.java
index 6a415118b4c..cd090d59ef5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwMutualExclusionResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/SwMutualExclusionResource.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/MessageComResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/MessageComResourceImpl.java
index 7cd4cdce019..1cc89e09e3f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/MessageComResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/MessageComResourceImpl.java
@@ -16,20 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MessageComResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MessageResourceKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.QueuePolicyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/NotificationResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/NotificationResourceImpl.java
index d07297fdbf0..9bd3cc44645 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/NotificationResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/NotificationResourceImpl.java
@@ -16,20 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.NotificationKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.NotificationResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.NotificationResourceKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionFactoryImpl.java
index 3e98d891ddf..56345b39a2b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionFactoryImpl.java
@@ -17,12 +17,20 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.ConcurrentAccessProtocolKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MessageComResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MessageResourceKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MutualExclusionResourceKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.NotificationKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.NotificationResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.NotificationResourceKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.QueuePolicyKind;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SharedDataComResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwMutualExclusionResource;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionPackageImpl.java
index cc9e3575e52..7e2158eb08f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SW_InteractionPackageImpl.java
@@ -18,89 +18,48 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.ConcurrentAccessProtocolKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MessageComResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MessageResourceKind;
@@ -116,65 +75,35 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwCommunic
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwInteractionResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwMutualExclusionResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwSynchronizationResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SharedDataComResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SharedDataComResourceImpl.java
index 1ac575496da..fa67369ba22 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SharedDataComResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SharedDataComResourceImpl.java
@@ -16,14 +16,10 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl;
import java.util.Collection;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SharedDataComResource;
-
import org.eclipse.uml2.uml.BehavioralFeature;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwCommunicationResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwCommunicationResourceImpl.java
index c7b1504231a..3f44a7ddfd4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwCommunicationResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwCommunicationResourceImpl.java
@@ -16,26 +16,18 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwCommunicationResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.TransmModeKind;
-
import org.eclipse.uml2.uml.Connector;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwInteractionResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwInteractionResourceImpl.java
index 4efe910cdf4..6b6d267de1f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwInteractionResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwInteractionResourceImpl.java
@@ -16,21 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.QueuePolicyKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwInteractionResource;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SwResourceImpl;
-
import org.eclipse.uml2.uml.TypedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwMutualExclusionResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwMutualExclusionResourceImpl.java
index 1615e9b634f..f35287a6b8b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwMutualExclusionResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwMutualExclusionResourceImpl.java
@@ -17,27 +17,19 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.ConcurrentAccessProtocolKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MutualExclusionResourceKind;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwMutualExclusionResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.ProtectProtocolKind;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwSynchronizationResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwSynchronizationResourceImpl.java
index c0527448386..9c26b809110 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwSynchronizationResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/impl/SwSynchronizationResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwSynchronizationResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionAdapterFactory.java
index 0865e042feb..09c4f5db017 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionAdapterFactory.java
@@ -15,15 +15,17 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MessageComResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.NotificationResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SharedDataComResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwCommunicationResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwInteractionResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwMutualExclusionResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwSynchronizationResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceFactoryImpl.java
index 57484daa79d..48446a11bdb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceImpl.java
index 6986cd49d4c..2c32fef7e6b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionSwitch.java
index f641a7996e2..d2d0f968b53 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionSwitch.java
@@ -17,11 +17,15 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.MessageComResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.NotificationResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SharedDataComResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwCommunicationResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwInteractionResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwMutualExclusionResource;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SwSynchronizationResource;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionXMLProcessor.java
index d1e594e804f..ae8700656d7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_Interaction/util/SW_InteractionXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SW_ResourceCorePackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SW_ResourceCorePackage.java
index 8b73091bf50..66f296fcb4a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SW_ResourceCorePackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SW_ResourceCorePackage.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwAccessService.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwAccessService.java
index 57537ac2821..d706d4c95e2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwAccessService.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwAccessService.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwResource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwResource.java
index 7ae96acdf85..e5fb6949687 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwResource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/SwResource.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCoreFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCoreFactoryImpl.java
index 810bbe296d7..5e4fcb7ed33 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCoreFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCoreFactoryImpl.java
@@ -16,12 +16,11 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.*;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCoreFactory;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwAccessService;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCorePackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCorePackageImpl.java
index eda0329353d..f87fec0e260 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCorePackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SW_ResourceCorePackageImpl.java
@@ -17,152 +17,81 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCoreFactory;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwAccessService;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwAccessServiceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwAccessServiceImpl.java
index c99699d3f64..c495c19296a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwAccessServiceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwAccessServiceImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwAccessService;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GrServiceImpl;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwResourceImpl.java
index 2e15579461a..3c31d81390c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/impl/SwResourceImpl.java
@@ -16,21 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.ResourceImpl;
-
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.TypedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreAdapterFactory.java
index ce42bec71e0..7270697d65e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreAdapterFactory.java
@@ -15,13 +15,11 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwAccessService;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceFactoryImpl.java
index afb100cbc37..0834e8d69c2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceImpl.java
index d893710928a..ef769ec82fb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreSwitch.java
index e8a9dcd4777..432acde79bf 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreSwitch.java
@@ -17,9 +17,9 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.*;
-
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwAccessService;
+import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SwResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreXMLProcessor.java
index bde83d6d1bf..b204ac6114f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_DesignModel/SRM/SW_ResourceCore/util/SW_ResourceCoreXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocate.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocate.java
index 29d1a4bf72e..f107e73b107 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocate.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocate.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.uml2.uml.Abstraction;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/AllocateActivityGroup.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/AllocateActivityGroup.java
index b1f17c7f772..20f3de21db5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/AllocateActivityGroup.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/AllocateActivityGroup.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.ActivityPartition;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocated.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocated.java
index 4157f2a8163..4c007a2a231 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocated.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Allocated.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Assign.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Assign.java
index a2f400102e7..5d137478db0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Assign.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/Assign.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Element;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/NfpRefine.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/NfpRefine.java
index 48b8f2ad5f2..ecc28e88a51 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/NfpRefine.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/NfpRefine.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.uml2.uml.Dependency;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocFactoryImpl.java
index e9fdf15d315..db9c0a6043a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocFactoryImpl.java
@@ -17,12 +17,20 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocateActivityGroup;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocated;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocationEndKind;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocationKind;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocationNature;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AssignmentKind;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AssignmentNature;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.NfpRefine;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocPackageImpl.java
index 7938de04c74..5e33e15ed99 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocPackageImpl.java
@@ -18,97 +18,52 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocFactory;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
@@ -121,57 +76,31 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AssignmentKind;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AssignmentNature;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.NfpRefine;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateActivityGroupImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateActivityGroupImpl.java
index 61e8530a6ab..97b74dc8d89 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateActivityGroupImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateActivityGroupImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocateActivityGroup;
-
import org.eclipse.uml2.uml.ActivityPartition;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateImpl.java
index aee16735e87..714f90d11a9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocateImpl.java
@@ -16,24 +16,17 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocationKind;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocationNature;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.uml2.uml.Abstraction;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocatedImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocatedImpl.java
index 553279f1179..40abf814aee 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocatedImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AllocatedImpl.java
@@ -17,23 +17,18 @@ import java.util.Collection;
import java.util.Iterator;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.BasicInternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocated;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocationEndKind;
import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
-
import org.eclipse.uml2.uml.Dependency;
import org.eclipse.uml2.uml.DirectedRelationship;
import org.eclipse.uml2.uml.Element;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AssignImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AssignImpl.java
index c0b62f3f493..bb29e09d8b6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AssignImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/AssignImpl.java
@@ -16,24 +16,17 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AssignmentKind;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AssignmentNature;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Element;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/NfpRefineImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/NfpRefineImpl.java
index a818f77e9b1..b9eb17b7660 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/NfpRefineImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/impl/NfpRefineImpl.java
@@ -16,22 +16,15 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.NfpRefine;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.uml2.uml.Dependency;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocAdapterFactory.java
index 30aa2009aee..6da57752ad4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocAdapterFactory.java
@@ -15,12 +15,14 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocateActivityGroup;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocated;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.NfpRefine;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceFactoryImpl.java
index 83ba6e511ae..94abd404d58 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceImpl.java
index 0edfc3fc59f..a4d99dd2853 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocSwitch.java
index ad61bd1bdc0..1e2a061fa04 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocSwitch.java
@@ -17,8 +17,12 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocateActivityGroup;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocated;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Assign;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.NfpRefine;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocXMLProcessor.java
index 6740c9614b4..13fa1498fd0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Alloc/util/AllocXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Configuration.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Configuration.java
index cbd887e6bf7..b9653e38986 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Configuration.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Configuration.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.StructuredClassifier;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Mode.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Mode.java
index 23fb1aa0c3a..83ed95cd341 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Mode.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/Mode.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.State;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeBehavior.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeBehavior.java
index 485860d564d..06f033b46d3 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeBehavior.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeBehavior.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.StateMachine;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeTransition.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeTransition.java
index 3ecaa6aaf80..853491ed81d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeTransition.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/ModeTransition.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Transition;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ConfigurationImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ConfigurationImpl.java
index 9e281658ee7..af6c2e78122 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ConfigurationImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ConfigurationImpl.java
@@ -16,21 +16,15 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Mode;
-
import org.eclipse.uml2.uml.StructuredClassifier;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsFactoryImpl.java
index aadad84a47e..44ee9438219 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsFactoryImpl.java
@@ -16,12 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Mode;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeTransition;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsPackageImpl.java
index f691605b22b..b39120e9d9b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/CoreElementsPackageImpl.java
@@ -16,154 +16,83 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsFactory;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Mode;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeBehavior;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeTransition;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeBehaviorImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeBehaviorImpl.java
index 6369b8b2371..39fb887e341 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeBehaviorImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeBehaviorImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeBehavior;
-
import org.eclipse.uml2.uml.StateMachine;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeImpl.java
index ab97c618cf2..629c14137e5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Mode;
-
import org.eclipse.uml2.uml.State;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeTransitionImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeTransitionImpl.java
index 26b74d90433..83efdac9190 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeTransitionImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/impl/ModeTransitionImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeTransition;
-
import org.eclipse.uml2.uml.Transition;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsAdapterFactory.java
index 7374e3e0452..b90e6248140 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsAdapterFactory.java
@@ -15,12 +15,13 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Mode;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeTransition;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceFactoryImpl.java
index fcf3623e6e0..5649a165d11 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceImpl.java
index af4d2038ccb..c20a5287dcd 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsSwitch.java
index 17f852ed65b..e5560335420 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsSwitch.java
@@ -17,8 +17,11 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Configuration;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Mode;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeBehavior;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.ModeTransition;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsXMLProcessor.java
index 50fa50fa030..50aa4d2f4ad 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/CoreElements/util/CoreElementsXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/CommunicationMedia.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/CommunicationMedia.java
index 4d0217f7d67..e5f7a0b9178 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/CommunicationMedia.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/CommunicationMedia.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.TransmModeKind;
-
import org.eclipse.uml2.uml.Connector;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/GrService.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/GrService.java
index 878de210111..914f59d76e7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/GrService.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/GrService.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Collaboration;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Resource.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Resource.java
index a41aeb76583..76dd719a7e5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Resource.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Resource.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.ConnectableElement;
import org.eclipse.uml2.uml.InstanceSpecification;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/ResourceUsage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/ResourceUsage.java
index f4fbc58feaa..bd8d004ad65 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/ResourceUsage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/ResourceUsage.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Scheduler.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Scheduler.java
index 3a719f15879..76eac34db7d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Scheduler.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/Scheduler.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.SchedPolicyKind;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/AcquireImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/AcquireImpl.java
index 8d0afc6ef83..8b79f417042 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/AcquireImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/AcquireImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Acquire;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ClockResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ClockResourceImpl.java
index 0f98e408778..98c469da5ef 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ClockResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ClockResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ClockResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationEndPointImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationEndPointImpl.java
index d9852d54622..0f3ab73baf0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationEndPointImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationEndPointImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationMediaImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationMediaImpl.java
index 5e06e28da33..b3fbfe08b91 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationMediaImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/CommunicationMediaImpl.java
@@ -16,21 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.TransmModeKind;
-
import org.eclipse.uml2.uml.Connector;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ComputingResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ComputingResourceImpl.java
index 1c89db71b88..e78b7a8dc46 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ComputingResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ComputingResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ConcurrencyResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ConcurrencyResourceImpl.java
index 2be9d3e31e2..228a125ce2a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ConcurrencyResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ConcurrencyResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ConcurrencyResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/DeviceResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/DeviceResourceImpl.java
index 338e054facf..38c872b3355 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/DeviceResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/DeviceResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.DeviceResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMFactoryImpl.java
index 37d774328af..bbed0e1da7b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMFactoryImpl.java
@@ -16,12 +16,30 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Acquire;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ClockResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ConcurrencyResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.DeviceResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Release;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SecondaryScheduler;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SynchronizationResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimerResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimingResource;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMPackageImpl.java
index 5e0bbd98078..558859b547c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GRMPackageImpl.java
@@ -17,105 +17,56 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Acquire;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ClockResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
@@ -138,61 +89,42 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SynchronizationResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimerResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimingResource;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
* <!-- end-user-doc -->
+ *
* @generated
*/
public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass resourceEClass = null;
@@ -200,6 +132,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass storageResourceEClass = null;
@@ -207,6 +140,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass communicationEndPointEClass = null;
@@ -214,6 +148,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass synchronizationResourceEClass = null;
@@ -221,6 +156,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass concurrencyResourceEClass = null;
@@ -228,6 +164,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass schedulerEClass = null;
@@ -235,6 +172,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass processingResourceEClass = null;
@@ -242,6 +180,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass computingResourceEClass = null;
@@ -249,6 +188,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass mutualExclusionResourceEClass = null;
@@ -256,6 +196,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass schedulableResourceEClass = null;
@@ -263,6 +204,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass secondarySchedulerEClass = null;
@@ -270,6 +212,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass communicationMediaEClass = null;
@@ -277,6 +220,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass deviceResourceEClass = null;
@@ -284,6 +228,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass timingResourceEClass = null;
@@ -291,6 +236,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass clockResourceEClass = null;
@@ -298,6 +244,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass timerResourceEClass = null;
@@ -305,6 +252,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass grServiceEClass = null;
@@ -312,6 +260,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass releaseEClass = null;
@@ -319,6 +268,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass acquireEClass = null;
@@ -326,20 +276,19 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private EClass resourceUsageEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package
* package URI value.
- * <p>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.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <p>
+ * 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. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage#eNS_URI
* @see #init()
@@ -352,6 +301,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
private static boolean isInited = false;
@@ -359,17 +309,19 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
- * <p>This method is used to initialize {@link GRMPackage#eINSTANCE} when that field is accessed.
- * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * <p>
+ * This method is used to initialize {@link GRMPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead,
+ * they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
* @generated
*/
public static GRMPackage init() {
- if (isInited) return (GRMPackage)EPackage.Registry.INSTANCE.getEPackage(GRMPackage.eNS_URI);
+ if(isInited) {
+ return (GRMPackage)EPackage.Registry.INSTANCE.getEPackage(GRMPackage.eNS_URI);
+ }
// Obtain or create and register package
GRMPackageImpl theGRMPackage = (GRMPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof GRMPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new GRMPackageImpl());
@@ -495,7 +447,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
// Mark meta-data to indicate it can't be changed
theGRMPackage.freeze();
-
+
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(GRMPackage.eNS_URI, theGRMPackage);
return theGRMPackage;
@@ -504,6 +456,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getResource() {
@@ -513,6 +466,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResource_ResMult() {
@@ -522,6 +476,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResource_IsProtected() {
@@ -531,6 +486,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResource_IsActive() {
@@ -540,6 +496,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getResource_Base_Property() {
@@ -549,6 +506,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getResource_Base_InstanceSpecification() {
@@ -558,6 +516,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getResource_Base_Classifier() {
@@ -567,6 +526,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getResource_Base_Lifeline() {
@@ -576,6 +536,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getResource_Base_ConnectableElement() {
@@ -585,6 +546,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getStorageResource() {
@@ -594,6 +556,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getStorageResource_ElementSize() {
@@ -603,6 +566,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCommunicationEndPoint() {
@@ -612,6 +576,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCommunicationEndPoint_PacketSize() {
@@ -621,6 +586,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getSynchronizationResource() {
@@ -630,6 +596,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getConcurrencyResource() {
@@ -639,6 +606,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getScheduler() {
@@ -648,6 +616,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getScheduler_IsPreemptible() {
@@ -657,6 +626,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getScheduler_SchedPolicy() {
@@ -666,6 +636,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getScheduler_OtherSchedPolicy() {
@@ -675,6 +646,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getScheduler_Schedule() {
@@ -684,6 +656,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getScheduler_ProcessingUnits() {
@@ -693,6 +666,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getScheduler_Host() {
@@ -702,6 +676,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getScheduler_ProtectedSharedResources() {
@@ -711,6 +686,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getScheduler_SchedulableResources() {
@@ -720,6 +696,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getProcessingResource() {
@@ -729,6 +706,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getProcessingResource_SpeedFactor() {
@@ -738,6 +716,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getProcessingResource_MainScheduler() {
@@ -747,6 +726,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getComputingResource() {
@@ -756,6 +736,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getMutualExclusionResource() {
@@ -765,6 +746,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getMutualExclusionResource_ProtectKind() {
@@ -774,6 +756,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getMutualExclusionResource_Ceiling() {
@@ -783,6 +766,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getMutualExclusionResource_OtherProtectProtocol() {
@@ -792,6 +776,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getMutualExclusionResource_Scheduler() {
@@ -801,6 +786,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getSchedulableResource() {
@@ -810,6 +796,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getSchedulableResource_SchedParams() {
@@ -819,6 +806,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getSchedulableResource_DependentScheduler() {
@@ -828,6 +816,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getSchedulableResource_Host() {
@@ -837,6 +826,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getSecondaryScheduler() {
@@ -846,6 +836,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getSecondaryScheduler_VirtualProcessingUnits() {
@@ -855,6 +846,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCommunicationMedia() {
@@ -864,6 +856,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCommunicationMedia_ElementSize() {
@@ -873,6 +866,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCommunicationMedia_Base_Connector() {
@@ -882,6 +876,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCommunicationMedia_TransmMode() {
@@ -891,6 +886,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCommunicationMedia_BlockT() {
@@ -900,6 +896,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCommunicationMedia_PacketT() {
@@ -909,6 +906,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCommunicationMedia_Capacity() {
@@ -918,6 +916,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getDeviceResource() {
@@ -927,6 +926,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getTimingResource() {
@@ -936,6 +936,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getClockResource() {
@@ -945,6 +946,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getTimerResource() {
@@ -954,6 +956,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getTimerResource_Duration() {
@@ -963,6 +966,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getTimerResource_IsPeriodic() {
@@ -972,6 +976,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getGrService() {
@@ -981,6 +986,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getGrService_Owner() {
@@ -990,6 +996,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getGrService_Base_ExecutionSpecification() {
@@ -999,6 +1006,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getGrService_Base_BehavioralFeature() {
@@ -1008,6 +1016,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getGrService_Base_Behavior() {
@@ -1017,6 +1026,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getGrService_Base_Collaboration() {
@@ -1026,6 +1036,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getGrService_Base_CollaborationUse() {
@@ -1035,6 +1046,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getRelease() {
@@ -1044,6 +1056,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getAcquire() {
@@ -1053,6 +1066,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getAcquire_IsBlocking() {
@@ -1062,6 +1076,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getResourceUsage() {
@@ -1071,6 +1086,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResourceUsage_ExecTime() {
@@ -1080,6 +1096,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResourceUsage_AllocatedMemory() {
@@ -1089,6 +1106,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResourceUsage_UsedMemory() {
@@ -1098,6 +1116,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResourceUsage_PowerPeak() {
@@ -1107,6 +1126,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResourceUsage_Energy() {
@@ -1116,6 +1136,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getResourceUsage_Base_NamedElement() {
@@ -1125,6 +1146,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getResourceUsage_SubUsage() {
@@ -1134,6 +1156,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getResourceUsage_UsedResources() {
@@ -1143,6 +1166,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getResourceUsage_MsgSize() {
@@ -1152,6 +1176,7 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public GRMFactory getGRMFactory() {
@@ -1161,19 +1186,23 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @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.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public void createPackageContents() {
- if (isCreated) return;
+ if(isCreated) {
+ return;
+ }
isCreated = true;
// Create classes and their features
@@ -1273,19 +1302,23 @@ public class GRMPackageImpl extends EPackageImpl implements GRMPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @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.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public void initializePackageContents() {
- if (isInitialized) return;
+ if(isInitialized) {
+ return;
+ }
isInitialized = true;
// Initialize package
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GrServiceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GrServiceImpl.java
index 9772844a244..b26c8bc4429 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GrServiceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/GrServiceImpl.java
@@ -14,17 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
-
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Collaboration;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/MutualExclusionResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/MutualExclusionResourceImpl.java
index 2ffaafc83d6..e96d10b5b95 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/MutualExclusionResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/MutualExclusionResourceImpl.java
@@ -15,16 +15,12 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.ProtectProtocolKind;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ProcessingResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ProcessingResourceImpl.java
index 03f8edec578..0f9274309c2 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ProcessingResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ProcessingResourceImpl.java
@@ -14,12 +14,9 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ReleaseImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ReleaseImpl.java
index 41fbf21a987..8fe8372c487 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ReleaseImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ReleaseImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Release;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceImpl.java
index 44e5560a028..f39b7296509 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
-
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.ConnectableElement;
import org.eclipse.uml2.uml.InstanceSpecification;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceUsageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceUsageImpl.java
index 3072da1661d..dbb692d6601 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceUsageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/ResourceUsageImpl.java
@@ -16,22 +16,16 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
-
import org.eclipse.uml2.uml.NamedElement;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulableResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulableResourceImpl.java
index c20f2a862d3..28ffc3a494c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulableResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulableResourceImpl.java
@@ -17,16 +17,11 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulerImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulerImpl.java
index f299128c430..4c4e48f0f93 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulerImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SchedulerImpl.java
@@ -17,25 +17,19 @@ import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.SchedPolicyKind;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SecondarySchedulerImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SecondarySchedulerImpl.java
index bd42eee3c74..5531f9b95bb 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SecondarySchedulerImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SecondarySchedulerImpl.java
@@ -16,15 +16,11 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SecondaryScheduler;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/StorageResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/StorageResourceImpl.java
index abc23b4cba9..11c908e7e19 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/StorageResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/StorageResourceImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SynchronizationResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SynchronizationResourceImpl.java
index 6050d82c8bf..71de146a8ba 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SynchronizationResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/SynchronizationResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SynchronizationResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimerResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimerResourceImpl.java
index 49164eec77a..712c22fdd8d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimerResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimerResourceImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimerResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimingResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimingResourceImpl.java
index f9e3014131e..0bd37997ac9 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimingResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/impl/TimingResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimingResource;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMAdapterFactory.java
index 1171afc356c..aaabed4c16b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMAdapterFactory.java
@@ -15,12 +15,29 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Acquire;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ClockResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ConcurrencyResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.DeviceResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Release;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SecondaryScheduler;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SynchronizationResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimerResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimingResource;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceFactoryImpl.java
index e0c317830fd..9bc806c857a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceImpl.java
index 87c79769ad4..a8c36b48c6f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMSwitch.java
index 6d473dd8fec..c9278edb281 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMSwitch.java
@@ -17,8 +17,27 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Acquire;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ClockResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationEndPoint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.CommunicationMedia;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ComputingResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ConcurrencyResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.DeviceResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GrService;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.MutualExclusionResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ProcessingResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Release;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Resource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.ResourceUsage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SchedulableResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.Scheduler;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SecondaryScheduler;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.StorageResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.SynchronizationResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimerResource;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.TimingResource;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMXMLProcessor.java
index c2fd7937a02..9fd218e7ae8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/GRM/util/GRMXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Dimension.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Dimension.java
index cc237c9bdfb..2cfd554839c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Dimension.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Dimension.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Enumeration;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NFPsPackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NFPsPackage.java
index 5e64ff3a71d..7544e628923 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NFPsPackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NFPsPackage.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Nfp.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Nfp.java
index e16f6d445d2..0b947ebbd97 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Nfp.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Nfp.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpConstraint.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpConstraint.java
index c1ab1565889..46155a2a9d3 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpConstraint.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpConstraint.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Mode;
-
import org.eclipse.uml2.uml.Constraint;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpType.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpType.java
index 72374e3f11b..7da96887c68 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpType.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/NfpType.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.TupleType;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Unit.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Unit.java
index 59495b4a289..482ff5c1fd4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Unit.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/Unit.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.EnumerationLiteral;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/DimensionImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/DimensionImpl.java
index 4de903faf76..630884a9c26 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/DimensionImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/DimensionImpl.java
@@ -16,21 +16,15 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeEList;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Dimension;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.uml2.uml.Enumeration;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsFactoryImpl.java
index f979d75cd77..ebad7faf886 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsFactoryImpl.java
@@ -17,12 +17,16 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.ConstraintKind;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Dimension;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Nfp;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpType;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Unit;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsPackageImpl.java
index bdabd132d2b..7ddc3545a03 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NFPsPackageImpl.java
@@ -14,115 +14,63 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.ConstraintKind;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Dimension;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsFactory;
@@ -131,45 +79,25 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Nfp;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpType;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Unit;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpConstraintImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpConstraintImpl.java
index de7c3ee1a19..b4e24cd9376 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpConstraintImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpConstraintImpl.java
@@ -16,23 +16,16 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.Mode;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.ConstraintKind;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.uml2.uml.Constraint;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpImpl.java
index df8009dd769..e74fb592d5d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Nfp;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpTypeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpTypeImpl.java
index ab25aa91825..3083762c7ca 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpTypeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/NfpTypeImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.TupleTypeImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpType;
-
import org.eclipse.uml2.uml.Property;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/UnitImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/UnitImpl.java
index 7736f3eeddf..91a5876ce83 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/UnitImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/impl/UnitImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Unit;
-
import org.eclipse.uml2.uml.EnumerationLiteral;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsAdapterFactory.java
index d82262a32d8..7c4409ef0de 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsAdapterFactory.java
@@ -15,14 +15,15 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.TupleType;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Dimension;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Nfp;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpType;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Unit;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceFactoryImpl.java
index 7acb6846ce9..37ff022c597 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceImpl.java
index d31ab46ecf8..89ee0135c5f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsSwitch.java
index 87ac2f1ee7f..b16ad39326d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsSwitch.java
@@ -17,10 +17,13 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.TupleType;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Dimension;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Nfp;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpType;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Unit;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsXMLProcessor.java
index 8c8be732194..043e840827a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/NFPs/util/NFPsXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/Clock.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/Clock.java
index 362a571418c..f1ffa9a6ef4 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/Clock.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/Clock.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Unit;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeStandardKind;
-
import org.eclipse.uml2.uml.Event;
import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/ClockType.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/ClockType.java
index 0b9dfce51ac..baeead2ae4e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/ClockType.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/ClockType.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeNatureKind;
-
import org.eclipse.uml2.uml.Enumeration;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimePackage.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimePackage.java
index d8bb2a69576..3f551cc670f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimePackage.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimePackage.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedConstraint.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedConstraint.java
index 7c021272553..a5ef7604726 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedConstraint.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedConstraint.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeInterpretationKind;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDomain.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDomain.java
index c00eb381b5a..a748cd1df7a 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDomain.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDomain.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.uml2.uml.Namespace;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDurationObservation.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDurationObservation.java
index de51624614b..048a92da53c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDurationObservation.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedDurationObservation.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.EventKind;
-
import org.eclipse.uml2.uml.DurationObservation;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedElement.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedElement.java
index ef466385248..cb5f64cf1c8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedElement.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedElement.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedInstantObservation.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedInstantObservation.java
index cdd780d90b9..4712598e44e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedInstantObservation.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedInstantObservation.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time;
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.EventKind;
-
import org.eclipse.uml2.uml.TimeObservation;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedValueSpecification.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedValueSpecification.java
index 349bbcb60d4..f2b1670fe3f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedValueSpecification.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/TimedValueSpecification.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time;
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeInterpretationKind;
-
import org.eclipse.uml2.uml.ValueSpecification;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockConstraintImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockConstraintImpl.java
index af45ff1c74e..b92062caad8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockConstraintImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockConstraintImpl.java
@@ -16,17 +16,11 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NfpConstraintImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockConstraint;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockImpl.java
index bc13f765c58..c8ad5ee24f7 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockImpl.java
@@ -14,21 +14,15 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.Unit;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeStandardKind;
-
import org.eclipse.uml2.uml.Event;
import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockTypeImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockTypeImpl.java
index 024c39d159d..46fce8f6354 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockTypeImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/ClockTypeImpl.java
@@ -14,18 +14,13 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeNatureKind;
-
import org.eclipse.uml2.uml.Enumeration;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimeFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimeFactoryImpl.java
index 1828dc60c8b..18ff8a8b197 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimeFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimeFactoryImpl.java
@@ -16,12 +16,20 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimeFactory;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDomain;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDurationObservation;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedEvent;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedInstantObservation;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedValueSpecification;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimePackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimePackageImpl.java
index 4c88587daf0..5163621a642 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimePackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimePackageImpl.java
@@ -17,113 +17,60 @@ import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockConstraint;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType;
@@ -137,41 +84,23 @@ import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedEvent;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedInstantObservation;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedValueSpecification;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedConstraintImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedConstraintImpl.java
index 7e25e328cf2..a07b5539366 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedConstraintImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedConstraintImpl.java
@@ -16,22 +16,15 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NfpConstraintImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedConstraint;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeInterpretationKind;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDomainImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDomainImpl.java
index 8a2d2b72b92..df12de4a687 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDomainImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDomainImpl.java
@@ -14,16 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDomain;
-
import org.eclipse.uml2.uml.Namespace;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDurationObservationImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDurationObservationImpl.java
index 4780ab2144b..6c801b82c0c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDurationObservationImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedDurationObservationImpl.java
@@ -16,21 +16,14 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDurationObservation;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.EventKind;
-
import org.eclipse.uml2.uml.DurationObservation;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedElementImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedElementImpl.java
index fd3f84f267c..2229aab9254 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedElementImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedElementImpl.java
@@ -16,13 +16,9 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import java.util.Collection;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedEventImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedEventImpl.java
index 81b01212233..195fc74ee01 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedEventImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedEventImpl.java
@@ -15,15 +15,11 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedEvent;
-
import org.eclipse.uml2.uml.TimeEvent;
import org.eclipse.uml2.uml.ValueSpecification;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedInstantObservationImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedInstantObservationImpl.java
index 4abb09d183f..4840bbfb334 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedInstantObservationImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedInstantObservationImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedInstantObservation;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.EventKind;
-
import org.eclipse.uml2.uml.TimeObservation;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedProcessingImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedProcessingImpl.java
index 38f558e1d51..fa0642b76d5 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedProcessingImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedProcessingImpl.java
@@ -15,15 +15,11 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
-
import org.eclipse.uml2.uml.Action;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Event;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedValueSpecificationImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedValueSpecificationImpl.java
index 37735530e04..4f9ced435dd 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedValueSpecificationImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/impl/TimedValueSpecificationImpl.java
@@ -14,17 +14,12 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedValueSpecification;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeInterpretationKind;
-
import org.eclipse.uml2.uml.ValueSpecification;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java
index d4cc3497a4c..9d29489bd86 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeAdapterFactory.java
@@ -15,14 +15,21 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDomain;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDurationObservation;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedEvent;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedInstantObservation;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedValueSpecification;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java
index dbdf0394acd..3ff187d3803 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceFactoryImpl.java
@@ -14,11 +14,8 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java
index 54daa7e8871..29c0cc2bd75 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeResourceImpl.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java
index 9fede948253..55c95d2350f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeSwitch.java
@@ -17,10 +17,19 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NfpConstraint;
-
-import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.*;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.Clock;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.ClockType;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedConstraint;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDomain;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedDurationObservation;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedElement;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedEvent;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedInstantObservation;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedProcessing;
+import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimedValueSpecification;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java
index 0e0bbdb220f..f43ef66acf6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/MARTE_Foundations/Time/util/TimeXMLProcessor.java
@@ -16,11 +16,8 @@ package org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.util;
import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEFactoryImpl.java
index e1904a08ac0..9917f16026f 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEFactoryImpl.java
@@ -17,12 +17,11 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE.*;
+import org.eclipse.papyrus.MARTE.MARTEFactory;
+import org.eclipse.papyrus.MARTE.MARTEPackage;
+import org.eclipse.papyrus.MARTE.dummy;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEPackageImpl.java
index 09bfad3d70f..0a7c2651c13 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE/impl/MARTEPackageImpl.java
@@ -15,153 +15,80 @@ package org.eclipse.papyrus.MARTE.impl;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.MARTE.dummy;
import org.eclipse.papyrus.MARTE.MARTEFactory;
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
+import org.eclipse.papyrus.MARTE.dummy;
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
-import org.eclipse.papyrus.MARTE.dummy;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesFactoryImpl.java
index 57ba7c77b18..24c9698ea02 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesFactoryImpl.java
@@ -17,12 +17,13 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.*;
+import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesFactory;
+import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
+import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.DirectionKind;
+import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.SourceKind;
+import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.StatisticalQualifierKind;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesPackageImpl.java
index 75be2e22a74..6b1b6340c4b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/BasicNFP_Types/impl/BasicNFP_TypesPackageImpl.java
@@ -16,153 +16,82 @@ package org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesFactory;
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.DirectionKind;
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.SourceKind;
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.StatisticalQualifierKind;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesFactoryImpl.java
index 1f128468ee1..a1ef5465ff0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesFactoryImpl.java
@@ -17,12 +17,13 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.*;
+import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesFactory;
+import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
+import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.PeriodicServerKind;
+import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.ProtectProtocolKind;
+import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.SchedPolicyKind;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesPackageImpl.java
index 3199ea83564..5bbcd4dbc2c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/GRM_BasicTypes/impl/GRM_BasicTypesPackageImpl.java
@@ -16,153 +16,82 @@ package org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesFactory;
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.PeriodicServerKind;
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.ProtectProtocolKind;
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.SchedPolicyKind;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesFactoryImpl.java
index 95d48a0d7a8..99feb26d79c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesFactoryImpl.java
@@ -17,12 +17,11 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.*;
+import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesFactory;
+import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
+import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.TransmModeKind;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesPackageImpl.java
index 2231a9bf242..90beb1a24f0 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_DataTypes/impl/MARTE_DataTypesPackageImpl.java
@@ -16,151 +16,80 @@ package org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesFactory;
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.TransmModeKind;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesFactoryImpl.java
index 48e5c123825..a2b39619f8c 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesFactoryImpl.java
@@ -17,12 +17,10 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.*;
+import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesFactory;
+import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesPackageImpl.java
index 9b50e3be9b6..4cfa2e8b16e 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MARTE_PrimitivesTypes/impl/MARTE_PrimitivesTypesPackageImpl.java
@@ -15,150 +15,79 @@ package org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesFactory;
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsFactoryImpl.java
index ef1fe02aa0a..efa2f45ab38 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsFactoryImpl.java
@@ -17,12 +17,19 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.*;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.AreaUnitKind;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.DataSizeUnitKind;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.DataTxRateUnitKind;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.EnergyUnitKind;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.FrequencyUnitKind;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.LengthUnitKind;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsFactory;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.PowerUnitKind;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.TimeUnitKind;
+import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.WeightUnitKind;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsPackageImpl.java
index 6aced6bbc58..f60c204ab0b 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/MeasurementUnits/impl/MeasurementUnitsPackageImpl.java
@@ -15,135 +15,71 @@ package org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.AreaUnitKind;
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.DataSizeUnitKind;
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.DataTxRateUnitKind;
@@ -155,19 +91,12 @@ import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackag
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.PowerUnitKind;
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.TimeUnitKind;
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.WeightUnitKind;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryFactoryImpl.java
index 00ad7d6b348..53aefb4e545 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryFactoryImpl.java
@@ -17,12 +17,10 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE_Library.RS_Library.*;
+import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryFactory;
+import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryPackageImpl.java
index 60751a25b60..8ae2c0b068d 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/RS_Library/impl/RS_LibraryPackageImpl.java
@@ -15,150 +15,79 @@ package org.eclipse.papyrus.MARTE_Library.RS_Library.impl;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryFactory;
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/IdealClockImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/IdealClockImpl.java
index 33c3ea5dae8..aca675f3a22 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/IdealClockImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/IdealClockImpl.java
@@ -14,9 +14,7 @@
package org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.IdealClock;
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryFactoryImpl.java
index f41857ad5bb..e78cee19b78 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryFactoryImpl.java
@@ -17,12 +17,13 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE_Library.TimeLibrary.*;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.IdealClock;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.LogicalTimeUnit;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryFactory;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeUnitKind;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryPackageImpl.java
index 79ee5edf3be..d0f7a656ed8 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/impl/TimeLibraryPackageImpl.java
@@ -17,153 +17,82 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.IdealClock;
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.LogicalTimeUnit;
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryFactory;
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeUnitKind;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl.TimeTypesLibraryPackageImpl;
-
import org.eclipse.uml2.uml.UMLPackage;
/**
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibraryAdapterFactory.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibraryAdapterFactory.java
index 35112a106f1..2a90409c597 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibraryAdapterFactory.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibraryAdapterFactory.java
@@ -15,12 +15,10 @@ package org.eclipse.papyrus.MARTE_Library.TimeLibrary.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE_Library.TimeLibrary.*;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.IdealClock;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibrarySwitch.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibrarySwitch.java
index 32e69f42b30..4581a3acfb6 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibrarySwitch.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeLibrary/util/TimeLibrarySwitch.java
@@ -17,8 +17,8 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.MARTE_Library.TimeLibrary.*;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.IdealClock;
+import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryFactoryImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryFactoryImpl.java
index 54162acd287..210212bcd43 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryFactoryImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryFactoryImpl.java
@@ -17,12 +17,14 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.*;
+import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.EventKind;
+import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeInterpretationKind;
+import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeNatureKind;
+import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeStandardKind;
+import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryFactory;
+import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
/**
* <!-- begin-user-doc -->
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryPackageImpl.java b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryPackageImpl.java
index 5d6dfc80ef0..68ddf7cb815 100644
--- a/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryPackageImpl.java
+++ b/extraplugins/marte/org.eclipse.papyrus.marte.static.profile/src/org/eclipse/papyrus/MARTE_Library/TimeTypesLibrary/impl/TimeTypesLibraryPackageImpl.java
@@ -15,154 +15,83 @@ package org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.impl;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTEPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.impl.GQAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.PAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.PAM.impl.PAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.SAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.SAM.impl.SAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.RSMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.RSM.impl.RSMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.DataTypesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.DataTypes.impl.DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.OperatorsPackage;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Operators.impl.OperatorsPackageImpl;
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.VariablesPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Annexes.VSL.Variables.impl.VariablesPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.GCMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.GCM.impl.GCMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.HLAMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HLAM.impl.HLAMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.HwGeneralPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwGeneral.impl.HwGeneralPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.HwCommunicationPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwCommunication.impl.HwCommunicationPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.HwComputingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwComputing.impl.HwComputingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.HwDevicePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwDevice.impl.HwDevicePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.HwMemoryPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwMemory.impl.HwMemoryPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.HwStorageManagerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwStorage.HwStorageManager.impl.HwStorageManagerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.HwTimingPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwLogical.HwTiming.impl.HwTimingPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.HwLayoutPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwLayout.impl.HwLayoutPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.HwPowerPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.HRM.HwPhysical.HwPower.impl.HwPowerPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.SW_BrokeringPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Brokering.impl.SW_BrokeringPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SW_ConcurrencyPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.impl.SW_ConcurrencyPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.SW_InteractionPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Interaction.impl.SW_InteractionPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.SW_ResourceCorePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_ResourceCore.impl.SW_ResourceCorePackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.AllocPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.impl.AllocPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.CoreElementsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.CoreElements.impl.CoreElementsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.GRMPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.GRM.impl.GRMPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.NFPsPackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.NFPs.impl.NFPsPackageImpl;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.TimePackage;
-
import org.eclipse.papyrus.MARTE.MARTE_Foundations.Time.impl.TimePackageImpl;
-
import org.eclipse.papyrus.MARTE.impl.MARTEPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.impl.BasicNFP_TypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.impl.GRM_BasicTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.MARTE_DataTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_DataTypes.impl.MARTE_DataTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.MARTE_PrimitivesTypesPackage;
-
import org.eclipse.papyrus.MARTE_Library.MARTE_PrimitivesTypes.impl.MARTE_PrimitivesTypesPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.MeasurementUnitsPackage;
-
import org.eclipse.papyrus.MARTE_Library.MeasurementUnits.impl.MeasurementUnitsPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.RS_LibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.RS_Library.impl.RS_LibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.TimeLibraryPackage;
-
import org.eclipse.papyrus.MARTE_Library.TimeLibrary.impl.TimeLibraryPackageImpl;
-
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.EventKind;
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeInterpretationKind;
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeNatureKind;
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeStandardKind;
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryFactory;
import org.eclipse.papyrus.MARTE_Library.TimeTypesLibrary.TimeTypesLibraryPackage;
-
import org.eclipse.uml2.uml.UMLPackage;
/**

Back to the top