diff options
Diffstat (limited to 'extraplugins')
99 files changed, 2599 insertions, 2202 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl index 4e9c816f748..68cfba58136 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl @@ -36,16 +36,20 @@ [comment return a list of owned attributes, since this is not supported directly on a classifier/] [query public getOwnedAttributes(cl : Classifier) : Sequence(Property) = - if (cl.oclIsKindOf(Class)) then + if cl.oclIsKindOf(Class) then oclAsType(Class).ownedAttribute else - if (cl.oclIsKindOf(DataType)) then + if cl.oclIsKindOf(DataType) then oclAsType(DataType).ownedAttribute else - if (cl.oclIsKindOf(Interface)) then + if cl.oclIsKindOf(Interface) then oclAsType(Interface).ownedAttribute else - Sequence{} + if cl.oclIsKindOf(Signal) then + oclAsType(Signal).ownedAttribute + else + Sequence{} + endif endif endif endif diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java index 6d0036abbd9..cc2a4b1bd86 100644 --- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java +++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes; public class AssociationPreferencePage extends DomainDiagramLinkPreferencePage { @@ -62,7 +62,7 @@ public class AssociationPreferencePage extends DomainDiagramLinkPreferencePage { // End of user code for(String labelName : labelDefaultVisibilityMap.keySet()) { - String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY); + String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY); store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName)); } } diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java index ad3711dd9a3..ebe2aef31c3 100644 --- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java +++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes; public class ClassPreferencePage extends DomainDiagramNodePreferencePage { @@ -68,17 +68,17 @@ public class ClassPreferencePage extends DomainDiagramNodePreferencePage { // Start of user code custom default initializations // End of user code - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java index 6bb644ead59..ee6be93e782 100644 --- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java +++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes; public class DataTypePreferencePage extends DomainDiagramNodePreferencePage { @@ -66,17 +66,17 @@ public class DataTypePreferencePage extends DomainDiagramNodePreferencePage { // Start of user code custom default initializations // End of user code - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java index da0991ee98c..e657245d4d6 100644 --- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java +++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes; public class EnumerationPreferencePage extends DomainDiagramNodePreferencePage { @@ -64,17 +64,17 @@ public class EnumerationPreferencePage extends DomainDiagramNodePreferencePage { // Start of user code custom default initializations // End of user code - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java index c71c7e14560..36297a055ff 100644 --- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java +++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes; public class GeneralizationPreferencePage extends DomainDiagramLinkPreferencePage { @@ -57,7 +57,7 @@ public class GeneralizationPreferencePage extends DomainDiagramLinkPreferencePag // End of user code for(String labelName : labelDefaultVisibilityMap.keySet()) { - String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY); + String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY); store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName)); } } diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java index 7fb5a04b3c6..ce68d99f86b 100644 --- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java +++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes; public class InstanceSpecificationPreferencePage extends DomainDiagramNodePreferencePage { @@ -64,17 +64,17 @@ public class InstanceSpecificationPreferencePage extends DomainDiagramNodePrefer // Start of user code custom default initializations // End of user code - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java index e76ef6f5c42..54c9fef6987 100644 --- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java +++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes; public class PackagePreferencePage extends DomainDiagramNodePreferencePage { @@ -64,17 +64,17 @@ public class PackagePreferencePage extends DomainDiagramNodePreferencePage { // Start of user code custom default initializations // End of user code - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java index b52978cfa3d..5b75fd61378 100644 --- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java +++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes; public class PrimitiveTypePreferencePage extends DomainDiagramNodePreferencePage { @@ -66,17 +66,17 @@ public class PrimitiveTypePreferencePage extends DomainDiagramNodePreferencePage // Start of user code custom default initializations // End of user code - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 50); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 50); // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo index 3bf89823b72..b4a22fdacc3 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo @@ -18,7 +18,7 @@ <acceleoCompiler sourceFolder="${target.folder}" outputFolder="${target.folder}" - dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;" + dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;" binaryResource="false" packagesToRegister=""> </acceleoCompiler> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java new file mode 100644 index 00000000000..297433c35a6 --- /dev/null +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java @@ -0,0 +1,7 @@ +package org.eclipse.papyrus.qompass.designer.core; + +import org.eclipse.uml2.uml.Element; + +public interface ElementFilter { + public boolean acceptElement(Element element); +} diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java index 71098035433..8f0a90b7f06 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java @@ -30,6 +30,21 @@ public class Messages extends NLS { public static String LWContainerTrafo_CannotApplyRule; + public static String ConnectorBinding_CannotFindBinding; + public static String ConnectorBinding_CannotFindBindingForPort; + public static String ConnectorBinding_CannotFindConsistentBinding; + public static String ConnectorBinding_ConnectorsPort; + public static String ConnectorBinding_FormalAlreadyBound; + public static String ConnectorBinding_InfoActualReturnIntfIs; + public static String ConnectorBinding_InfoConnPortConnectedVia; + public static String ConnectorBinding_InfoConnectsPort; + public static String ConnectorBinding_InfoCreateBoundPackage; + + public static String ConnectorBinding_InfoMatchOtherEnd; + + public static String ConnectorBinding_InfoProvidedPortTypeMatches; + public static String ConnectorBinding_NoTemplateSignature; + public static String ConnectorReification_CannotFindMatchingPort; public static String ConnectorReification_CouldNotBind; public static String ConnectorReification_CouldNotConnectPort; @@ -45,6 +60,10 @@ public class Messages extends NLS { public static String LanguageSupport_LanguageNotSupported; + public static String TemplateUtils_InfoCreateBoundPackage; + public static String TemplateUtils_InfoGetActualFrom; + public static String TemplateUtils_NoTemplateSignature; + public static String TemplateInstantiation_TemplateIsNull; public static String TemplateInstantiationListener_TrafoException; @@ -54,7 +73,6 @@ public class Messages extends NLS { public static String ContainerTrafo_CannotApplyRule; public static String ContainerTrafo_CannotFindDelegationConn; - public static String ContainerTrafo_InfoMoveSlots; public static String ContainerTrafo_InterceptionRuleButNoInterceptor; public static String InstantiateDepPlan_AcceleoErrors; @@ -88,6 +106,8 @@ public class Messages extends NLS { public static String DepPlanUtils_CannotFindAttribute; public static String DepPlanUtils_ConfigOfPropertyFailed; + + public static String UpdateUtils_CannotApplyFCMstereo; static { // initialize resource bundle diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java index 113925fdb9e..562f6cd4275 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java @@ -33,6 +33,8 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class EnumService { + private static final String GLOBALENUMS = "globalenums"; //$NON-NLS-1$ + public static void init() { enumHash.clear(); } @@ -134,7 +136,7 @@ public class EnumService { } public static void createEnumPackage(Package root) { - enumPkg = root.createNestedPackage("globalenums"); + enumPkg = root.createNestedPackage(GLOBALENUMS); } public static Package enumPkg; diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java index ba5d57fcf0a..d63fd1b3655 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java @@ -55,6 +55,8 @@ import org.eclipse.uml2.uml.util.UMLUtil; public class UMLTool { + private static final String UNDERSCORE = "_"; //$NON-NLS-1$ + /** * @param operation * @return all in and inout parameters of an operation @@ -115,8 +117,8 @@ public class UMLTool { * Unlike varName2, replace scoping signs as well */ public static String varName(String umlName) { - umlName = umlName.replace(".", "_"); - umlName = umlName.replace("::", "_"); + umlName = umlName.replace(".", UNDERSCORE); //$NON-NLS-1$ + umlName = umlName.replace(Namespace.SEPARATOR, UNDERSCORE); return varName2(umlName); } @@ -137,10 +139,10 @@ public class UMLTool { * @return */ public static String varName2(String umlName) { - umlName = umlName.replace(" ", "_"); - umlName = umlName.replace("-", "_"); - umlName = umlName.replace("+", "_"); - umlName = umlName.replace("?", "_"); + umlName = umlName.replace(" ", UNDERSCORE); //$NON-NLS-1$ + umlName = umlName.replace("-", UNDERSCORE); //$NON-NLS-1$ + umlName = umlName.replace("+", UNDERSCORE); //$NON-NLS-1$ + umlName = umlName.replace("?", UNDERSCORE); //$NON-NLS-1$ return umlName; } @@ -320,7 +322,7 @@ public class UMLTool { if(resource instanceof XMLResource) { XMLResource xmlResource = (XMLResource)resource; - return "\"" + xmlResource.getURIFragment(element) + "\""; + return "\"" + xmlResource.getURIFragment(element) + "\""; //$NON-NLS-1$//$NON-NLS-2$ } return null; } @@ -376,7 +378,7 @@ public class UMLTool { public static String encodeID(String uri) { // _ becomes escape character. original _ is __, '-' becomes _M return uri. - replace("_", "__"). //$NON-NLS-1$ //$NON-NLS-2$ + replace(UNDERSCORE, UNDERSCORE + UNDERSCORE). replace("-", "_M"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java index 8d92db8ab03..ef288caaf17 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java @@ -128,15 +128,15 @@ public class AllocUtils { } /** - * This method returns a list of nodes when given an instance. + * This method returns a list of nodes (or threads) to which the passed instance is allocated. * It is based on MARTE Allocation (a stereotyped abstraction) which is a generic * mechanism to deploy UML elements to nodes. * * @param instanceOrThread - * The instance that should be deployed + * The instance for which we like to know the allocation information * @return */ - public static EList<InstanceSpecification> getNodesOrThreads(NamedElement instanceOrThread) { + public static EList<InstanceSpecification> getNodesOrThreads(InstanceSpecification instanceOrThread) { EList<InstanceSpecification> nodeList = new UniqueEList<InstanceSpecification>(); for(DirectedRelationship relationship : instanceOrThread.getSourceDirectedRelationships(UMLPackage.eINSTANCE.getAbstraction())) { @@ -153,22 +153,22 @@ public class AllocUtils { } /** - * This method returns a list of nodes when given an instance. - * It is based on MARTE Allocation (a stereotyped abstraction) which is a generic - * mechanism to deploy UML elements to nodes. - * + * This method returns a list of nodes to which the passed instance is allocated. If + * the instance is allocated directly to a node, this node is returned. If the instance + * is allocated to a thread, the allocation of the thread to a node is returned. + * * @param instanceOrThread * The instance that should be deployed * @return */ - public static EList<InstanceSpecification> getNodes(NamedElement instanceOrThread) { + public static EList<InstanceSpecification> getNodes(InstanceSpecification instanceOrThread) { EList<InstanceSpecification> nodeList = new UniqueEList<InstanceSpecification>(); EList<InstanceSpecification> nodeOrThreads = getNodesOrThreads(instanceOrThread); for(InstanceSpecification nodeOrThread : nodeOrThreads) { Classifier nodeOrThreadC = DepUtils.getClassifier(nodeOrThread); if(StereotypeUtil.isApplied(nodeOrThreadC, SwSchedulableResource.class)) { - // tread case that instance is allocated to a thread + // treat case that instance is allocated to a thread // follow allocation of Thread nodeList.add(getNode(nodeOrThread)); } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java index 01db2d31628..097c759a165 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java @@ -270,15 +270,16 @@ public class DepCreation { createSlot(is, partIS, attribute); } - } else if(StereotypeUtil.isApplied(attribute, - ConfigurationProperty.class) + } + else if(StereotypeUtil.isApplied(attribute, ConfigurationProperty.class) && createSlotsForConfigValues) { // is a configuration property, create slot // TODO: implicit assumption that configuration attributes // are not components createSlotForConfigProp(is, attribute); } - } else if(type instanceof Class) { + } + else if(type instanceof Class) { // no composition - only create slot, if a singleton // (otherwise, it's not clear with which instance the slot // should be associated) @@ -374,13 +375,10 @@ public class DepCreation { throws TransformationException { // create an instance specification for the composite InstanceSpecification is = null; - if(name != null) { - // donn't create instance specification for root element (detectable via the empty name) - is = (InstanceSpecification)platform.createPackagedElement(name, - UMLPackage.eINSTANCE.getInstanceSpecification()); - is.getClassifiers().add(implementation); - } - + is = (InstanceSpecification)platform.createPackagedElement(name, + UMLPackage.eINSTANCE.getInstanceSpecification()); + is.getClassifiers().add(implementation); + // add connector and container implementations for(Property attribute : implementation.getAllAttributes()) { @@ -396,8 +394,6 @@ public class DepCreation { if(type instanceof Class) { // should be a node, but do not require it Class cl = (Class)type; - // hack: ad-hoc replication support. Better solution via - // Design patterns int upper = attribute.getUpper(); String infix = ""; //$NON-NLS-1$ // TODO: check validation constraints @@ -543,7 +539,6 @@ public class DepCreation { * specification * @return The value specifications for the passed source property or null */ - public static ValueSpecification getNearestValue( Stack<InstanceSpecification> isStack, Property source) { Stack<InstanceSpecification> copy = new Stack<InstanceSpecification>(); @@ -561,7 +556,7 @@ public class DepCreation { /** * Helper for getNearestValue: search for an instance specification that has * source as defining feature. Start at the passed instance specification, - * but do not recursed into elements that are contained in the stack. + * but do not recurse into elements that are contained in the stack. * * @param isStack * A stack of instance specifications corresponding to a path diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java index dc3a3df1a88..2c709c0a7bc 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java @@ -14,6 +14,7 @@ import org.eclipse.papyrus.FCM.ImplementationGroup; import org.eclipse.papyrus.FCM.ImplementationProperties; import org.eclipse.papyrus.FCM.InteractionComponent; import org.eclipse.papyrus.FCM.Target; +import org.eclipse.papyrus.qompass.designer.core.ElementFilter; import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.uml2.common.util.UML2Util; @@ -306,9 +307,7 @@ public class DepUtils { * @return the associated slot or null, if it does not exist */ public static Slot getSlot(InstanceSpecification is, Property property) { - Iterator<Slot> slots = is.getSlots().iterator(); - while(slots.hasNext()) { - Slot slot = slots.next(); + for (Slot slot : is.getSlots()) { if(slot.getDefiningFeature() == property) { return slot; } @@ -370,8 +369,8 @@ public class DepUtils { } /** - * Return an instance specification that refers to the composite in which the - * passed instance is contained + * Return a slot for a given instance specification. The slot is the first one in a list of slots + * whose value points to the passed instance. * * @param is * an instance that is contained within an composite (i.e. that @@ -380,7 +379,6 @@ public class DepUtils { */ public static Slot getParentSlot(InstanceSpecification is) { for(Slot slot : getReferencingSlots(is)) { - // no trigger is referencing the event any more, delete call event if(slot.getDefiningFeature() instanceof Property) { if(((Property)slot.getDefiningFeature()).getAggregation() == AggregationKind.COMPOSITE_LITERAL) { return slot; @@ -460,4 +458,24 @@ public class DepUtils { return null; } } + + /** + * Get all instances within a package that comply with a filter criterion. Recurse into sub-packages. + * @param pkg Starting package for search + * @param instanceList list of instances + * @param filter filter criterion. + */ + public static void getAllInstances(Package pkg, EList<InstanceSpecification> instanceList, ElementFilter filter) { + for(PackageableElement el : pkg.getPackagedElements()) { + if(el instanceof Package) { + getAllInstances((Package)el, instanceList, filter); + } + else if(el instanceof InstanceSpecification) { + InstanceSpecification instance = (InstanceSpecification)el; + if (filter.acceptElement(instance)) { + instanceList.add(instance); + } + } + } + } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java index 1ac85cefc79..70c94ba5a99 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java @@ -5,8 +5,10 @@ public class DeployConstants { public static final String singletonPrefix = "singleton_"; //$NON-NLS-1$ public static final String COMPONENT_MODEL = "ComponentModel"; //$NON-NLS-1$ public static final String depPlanFolder = "deployment"; //$NON-NLS-1$ + public static final String depPlanFolderHw = "platform"; //$NON-NLS-1$ + public static final String DepPlanPostfix = "DepPlan"; //$NON-NLS-1$ + public static final String DepPlanPostfixHw = "Platform"; //$NON-NLS-1$ public static final String MAIN_INSTANCE = "mainInstance"; //$NON-NLS-1$ public static final String SEP_CHAR = "."; //$NON-NLS-1$ public static final String AUTO_POSTFIX = "_auto"; //$NON-NLS-1$ - public static final String DepPlanPostfix = "DepPlan"; //$NON-NLS-1$ } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties index ccd9c89ef52..c237acc8ada 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties @@ -14,6 +14,22 @@ Description_NoAvail=not available LWContainerTrafo_CannotApplyRule=Cannot apply container rule <%s>, since the type of one of its parts is undefined. Check for unresolved proxies in imports +TemplateUtils_InfoCreateBoundPackage=create bound package (fixed binding): %s within %s +TemplateUtils_InfoGetActualFrom=TemplateInstantiation.getActualFromBinding: substitution formal = %s +TemplateUtils_NoTemplateSignature=no template signature found for %s + +ConnectorBinding_InfoConnPortConnectedVia=connector port <%s> is connected via <%s> +ConnectorBinding_CannotFindBinding=error: can not find a binding for formal parameter %s in the context of composite %s, connector %s and (connector) template %s. +ConnectorBinding_CannotFindBindingForPort=Cannot find a binding for port %s of connector %s. +ConnectorBinding_CannotFindConsistentBinding=cannot find a consistent binding for port %s of connector %s (in %s). Formal already bound to type %s +ConnectorBinding_ConnectorsPort=connects port, otherInterface = %s +ConnectorBinding_FormalAlreadyBound=Formal already bound to type %s +ConnectorBinding_InfoActualReturnIntfIs=actual return interface: %s +ConnectorBinding_InfoConnectsPort=connects port, otherInterface = %s +ConnectorBinding_InfoCreateBoundPackage=create bound package %s within %s +ConnectorBinding_InfoMatchOtherEnd=matchOtherEnd: port %s +ConnectorBinding_InfoProvidedPortTypeMatches=getActual: provided port type matches, port %s. +ConnectorBinding_NoTemplateSignature=ConnectorBinding: no template signature found for %s ConnectorReification_CannotFindMatchingPort=Connector reification: cannot find a matching port on reified connector %s for port %s. This should not happen and indicates an internal tool chain error. ConnectorReification_CouldNotBind=could not bind connector implementation template <%s> ConnectorReification_CouldNotConnectPort=Error: could not connect connector port <%s>. @@ -37,7 +53,6 @@ CompTypeTrafos_CannotFindType=Can not find type <%s>. Thus, unable to create sui ContainerTrafo_CannotApplyRule=Cannot apply container rule <%s>, since the type of one of its parts is undefined. Check for unresolved proxies in imports ContainerTrafo_CannotFindDelegationConn=(during interceptor transformation for container): cannot find existing delegation connector -ContainerTrafo_InfoMoveSlots=Move slots for instance %s ContainerTrafo_InterceptionRuleButNoInterceptor=The part %s in rule %s has an interceptionRule, but is not typed with an interaction component InstantiateDepPlan_AcceleoErrors=Acceleo errors occured InstantiateDepPlan_AcceleoErrorsCheckLog=Acceleo errors occured during code generation. Please check the error log @@ -68,3 +83,4 @@ CompImplSync_InfoSyncViaType=syncViaType => implementation %s DepPlanUtils_CannotFindAttribute=cannot find attribute %s in classifier %s DepPlanUtils_ConfigOfPropertyFailed=configuration of property %s failed: type is not a string +UpdateUtils_CannotApplyFCMstereo=cannot apply FCM stereotype. Check whether profile is applied diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java index e63e1592482..888cb0d89da 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java @@ -22,6 +22,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils; import org.eclipse.papyrus.qompass.designer.core.CreationUtils; import org.eclipse.papyrus.qompass.designer.core.Log; +import org.eclipse.papyrus.qompass.designer.core.Messages; import org.eclipse.papyrus.qompass.designer.core.PortUtils; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; @@ -84,7 +85,7 @@ public class ConnectorBinding { // with whom this port is connected, i.e. examine all connectorEnds // The type of the connected port determines the binding. Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - "matchOtherEnd: port %s", port.getName())); //$NON-NLS-1$ + "", port.getName())); //$NON-NLS-1$ for(ConnectorEnd connEnd : connector.getEnds()) { // the connector end targets a port of a part or the composite (in case of delegation) @@ -102,16 +103,16 @@ public class ConnectorBinding { } else { otherInterface = PortUtils.getProvided(otherPort); } - Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format("connects port, otherInterface = %s", otherInterface)); + Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(Messages.ConnectorBinding_ConnectorsPort, otherInterface)); if(otherInterface != null) { if(actual == null) { actual = otherInterface; Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - "actual return interface: %s", actual.getQualifiedName())); + Messages.ConnectorBinding_InfoActualReturnIntfIs, actual.getQualifiedName())); } else if(actual != otherInterface) { throw new TransformationException(String.format( - "cannot find a consistent binding for port %s of connector. Formal already bound to type %s", - port.getName(), connector.getName(), actual.getName())); + Messages.ConnectorBinding_CannotFindConsistentBinding, + port.getName(), connector.getName(), connector.getNamespace().getName(), actual.getName())); } } } @@ -125,7 +126,7 @@ public class ConnectorBinding { // with whom this port is connected, i.e. examine all connectors of the // composite. The type of the connected port determines the binding. Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - "matchOtherEnd: port %s", port.getName())); //$NON-NLS-1$ + Messages.ConnectorBinding_InfoMatchOtherEnd, port.getName())); for(Connector connector : partConnector.getClass_().getOwnedConnectors()) { if(ConnectorUtils.connectsPart(connector, partConnector)) { @@ -145,16 +146,16 @@ public class ConnectorBinding { } else { otherInterface = PortUtils.getProvided(otherPort); } - Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format("connects port, otherInterface = %s", otherInterface)); + Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(Messages.ConnectorBinding_InfoConnectsPort, otherInterface)); if(otherInterface != null) { if(actual == null) { actual = otherInterface; Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - "actual return interface: %s", actual.getQualifiedName())); + Messages.ConnectorBinding_InfoActualReturnIntfIs, actual.getQualifiedName())); } else if(actual != otherInterface) { throw new TransformationException(String.format( - "cannot find a consistent binding for port %s of connector %s. Formal already bound to type %s", - port.getName(), connector.getName(), actual.getName())); + Messages.ConnectorBinding_CannotFindConsistentBinding, + port.getName(), connector.getName(), connector.getNamespace().getName(), actual.getName())); } } } @@ -221,7 +222,7 @@ public class ConnectorBinding { // with whom this port is connected, i.e. examine all ends of the // connector. The type of the connected port determines the binding. Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - "getActual: provided port type matches, port %s.", port.getName())); //$NON-NLS-1$ + Messages.ConnectorBinding_InfoProvidedPortTypeMatches, port.getName())); boolean found = false; if(partOrConnector instanceof Property) { @@ -259,7 +260,7 @@ public class ConnectorBinding { protected static String createErrorMsg(Port port, Feature partOrConnector) { String errorMsg = String.format( - "Cannot find a binding for port %s of connector %s.", + Messages.ConnectorBinding_CannotFindBindingForPort, port.getName(), partOrConnector.getName()); for(Classifier cl : partOrConnector.getFeaturingClassifiers()) { errorMsg += " of class '" + cl.getName() + "'"; //$NON-NLS-1$ //$NON-NLS-2$ @@ -280,7 +281,7 @@ public class ConnectorBinding { Port otherPort = (Port)connElem; Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - " getActual, connector port <%s> is connected via <%s>", + Messages.ConnectorBinding_InfoConnPortConnectedVia, port.getName(), partOrConnector.getName())); Type otherType = otherPort.getType(); @@ -305,10 +306,10 @@ public class ConnectorBinding { if(actual == null) { actual = otherType; Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - "actual return interface: %s", actual.getQualifiedName())); + Messages.ConnectorBinding_InfoActualReturnIntfIs, actual.getQualifiedName())); } else if(actual != otherType) { - throw new TransformationException(errorMsg + " " + String.format( - "Formal already bound to type %s", actual.getName())); + throw new TransformationException(errorMsg + " " + String.format( //$NON-NLS-1$ + Messages.ConnectorBinding_FormalAlreadyBound, actual.getName())); } } } @@ -342,7 +343,7 @@ public class ConnectorBinding { // not a template. This is not an exception, caller need to handle "null" a return // value indicating that no template instantiation needs to be done. Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - "ConnectorBinding: no template signature found for %s", template.getName())); + Messages.ConnectorBinding_NoTemplateSignature, template.getName())); return null; } @@ -397,7 +398,7 @@ public class ConnectorBinding { name = name + "_" + ((NamedElement)actual).getName(); //$NON-NLS-1$ } else { String reason = String.format( - "error: can not find a binding for formal parameter %s in the context of composite %s, connector %s and (connector) template %s.", + Messages.ConnectorBinding_CannotFindBinding, ((NamedElement)formal).getName(), composite.getName(), connector.getName(), template.getName()); throw new TransformationException(reason); } @@ -418,7 +419,7 @@ public class ConnectorBinding { boundPackage = ((Package)owner).createNestedPackage(name); Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( - "create bound package %s within %s", name, owner.getName())); + Messages.ConnectorBinding_InfoCreateBoundPackage, name, owner.getName())); } TemplateBinding binding = boundPackage.getTemplateBinding(signature); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java index 9656d86df3f..410a5f35a37 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java @@ -21,6 +21,7 @@ import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.papyrus.qompass.designer.core.CreationUtils; import org.eclipse.papyrus.qompass.designer.core.Log; +import org.eclipse.papyrus.qompass.designer.core.Messages; import org.eclipse.papyrus.qompass.designer.core.transformations.Copy; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; import org.eclipse.uml2.uml.Classifier; @@ -123,10 +124,9 @@ public class TemplateUtils { TemplateSignature signature = getSignature(template); if(signature == null) { // not a template, retain original name - Log.log(Status.INFO, Log.TEMPLATE_BINDING, - "no template signature found" + (template instanceof NamedElement ? - " for " + ((NamedElement)template).getName() : - "")); + Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( + Messages.TemplateUtils_NoTemplateSignature, (template instanceof NamedElement ? + ((NamedElement)template).getName() : "undef"))); //$NON-NLS-1$ return null; } @@ -157,9 +157,8 @@ public class TemplateUtils { // class does not exist yet, needs to be created. boundPackage = ((Package)owner).createNestedPackage(name); - Log.log(Status.INFO, Log.TEMPLATE_BINDING, - "create bound package (fixed binding): " + name - + " within " + owner.getName()); + Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format( + Messages.TemplateUtils_InfoCreateBoundPackage, name, owner.getName())); } TemplateBinding binding = boundPackage.getTemplateBinding(signature); @@ -244,8 +243,8 @@ public class TemplateUtils { for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) { ParameterableElement pe = substitution.getFormal().getParameteredElement(); if(pe == formal) { - Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION, - "TemplateInstantiation.getActualFromBinding: substitution formal = " + pe); + Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION, String.format( + Messages.TemplateUtils_InfoGetActualFrom, pe)); return (Classifier)substitution.getActual(); } } @@ -256,8 +255,8 @@ public class TemplateUtils { TemplateBinding binding, String formalName) { for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) { ParameterableElement pe = substitution.getFormal().getParameteredElement(); - Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION, - "TemplateInstantiation.getActualFromBinding: substitution formal = " + pe); + Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION, String.format( + Messages.TemplateUtils_InfoGetActualFrom, pe)); if((pe instanceof NamedElement) && ((NamedElement)pe).getName().equals(formalName)) { return (Classifier)substitution.getActual(); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java index 13a963f9f91..2d7d5c39eef 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java @@ -46,16 +46,6 @@ public abstract class AbstractContainerTrafo { */ protected static Map<Class, AbstractContainerTrafo> containers; - /** - * Only configure the instances, i.e. avoid re-creating elements of the container, but create - * the UML instance specifications - */ - public void configureOnly() { - configureOnly = true; - } - - protected boolean configureOnly; - public abstract void createContainer(Class smComponent, Class tmComponent) throws TransformationException; /** @@ -69,7 +59,7 @@ public abstract class AbstractContainerTrafo { * @param context * Additional information about the container that is used by instance configurators */ - public abstract void createContainerInstance(Class tmComponent, InstanceSpecification tmIS, ContainerContext context) + public abstract InstanceSpecification createContainerInstance(Class tmComponent, InstanceSpecification tmIS, ContainerContext context) throws TransformationException; /** @@ -88,34 +78,24 @@ public abstract class AbstractContainerTrafo { throws TransformationException; /** - * Move a slot from the executor instance specification to an instance - * specification of an extension/interceptor This is required, since the - * users cannot configure containers directly. The modification is done in - * the target model, i.e. the user model is not affected. - * - * Default implementation is empty - */ - public void moveSlots() { - } - - /** * The instance specification of the created container */ - protected InstanceSpecification containerIS; + // protected InstanceSpecification containerIS; /** - * Store source and target model + * Copy class from source to target model */ protected Copy copy; /** - * @return the instance specification of the created container + * Is called after a set of rule applications. + * Does nothing by default */ - public InstanceSpecification getContainerIS() { - return containerIS; + public void finalize() { } + /** * The created container implementation (prefixed with sm, since part of * source model) @@ -129,12 +109,12 @@ public abstract class AbstractContainerTrafo { protected Class tmClass; /** - * deployment plan within target model + * deployment plan within source model */ - protected Package tmCDP; - + protected Package smCDP; + /** - * Additional information about the container that is used by instance configurators + * deployment plan within target model */ - protected ContainerContext context; + protected Package tmCDP; } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java index 5ba73c5cb29..8c385174d53 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java @@ -184,7 +184,8 @@ public class ConnectorReification { * connector element within the source model * @param tmIS * target model instance specification of the composite in which the reified connector - * (the part typed with the instantiated interaction component) should be created + * (the part typed with the instantiated interaction component) should be created. + * The instance is only used to find a suitable implementation. * @param args * addtion args for the Acceleo transformation * @return the created part within tmComponent @@ -463,13 +464,12 @@ public class ConnectorReification { // find instance that is associated with other part. for(Slot slot : compositeIS.getSlots()) { if(slot.getDefiningFeature() == otherPart) { - InstanceSpecification containedInstance = DepUtils - .getInstance(slot); + InstanceSpecification containedInstance = DepUtils.getInstance(slot); // TODO: too complicated, if the non-connector is a composite as well, it must be clearly allocated EList<InstanceSpecification> nodes = AllocUtils.getAllNodesForPort( containedInstance, otherPort); - AllocUtils.propagateNodesViaPort(DepUtils - .getInstance(partSlot), myPort, nodes); + AllocUtils.propagateNodesViaPort( + DepUtils.getInstance(partSlot), myPort, nodes); break; } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerContext.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerContext.java index 216e74ee31f..59839e5593f 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerContext.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerContext.java @@ -31,21 +31,31 @@ public class ContainerContext { * Convenience constructor. Used to initialize elements known outside the container transformation * itself * Constructor. - * - * @param executorPart - * @param nodeExecutorPart + * + * @param copy copier + * @param smIS original component in source model + * @param executorPart part representing the executor + * @param nodeExecutorPart allocation target (in case of HW model) */ - public ContainerContext(StructuralFeature executorPart, StructuralFeature nodeExecutorPart) { + public ContainerContext(Copy copy, InstanceSpecification smIS, StructuralFeature executorPart, StructuralFeature nodeExecutorPart) { + this.copy = copy; + this.smIS = smIS; this.smPartDF = executorPart; this.smNodePartDF = nodeExecutorPart; } /** + * original instance specification for a component in the source model. It might be used by instance configurators that need to access the + * configuration of the original component. + */ + public InstanceSpecification smIS; + + /** * The instance specification of the executor. It is a part of container that has been created, thus * an element of the target model. */ public InstanceSpecification executorIS; - + /** * The part within a composite that represents a component applying a container rule. It is * part of the source model. The main motivation for this information is that some instance configurators @@ -66,7 +76,9 @@ public class ContainerContext { /** * The port that is intercepted in case of an interceptor configuration. + * TODO: since container is *instantiated* after interception, port value is not useful */ public Port port; - + + public Copy copy; } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java index 7626b23535c..d2aece79dd0 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java @@ -18,7 +18,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.util.EcoreUtil; @@ -27,7 +26,6 @@ import org.eclipse.papyrus.FCM.InteractionComponent; import org.eclipse.papyrus.FCM.InterceptionKind; import org.eclipse.papyrus.FCM.InterceptionRule; import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils; -import org.eclipse.papyrus.qompass.designer.core.Log; import org.eclipse.papyrus.qompass.designer.core.Messages; import org.eclipse.papyrus.qompass.designer.core.PortUtils; import org.eclipse.papyrus.qompass.designer.core.StUtils; @@ -35,6 +33,7 @@ import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.qompass.designer.core.acceleo.UMLTool; import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation; import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils; +import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants; import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator; import org.eclipse.papyrus.qompass.designer.core.templates.TemplateInstantiation; import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils; @@ -44,9 +43,11 @@ import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.Connector; import org.eclipse.uml2.uml.ConnectorEnd; +import org.eclipse.uml2.uml.EncapsulatedClassifier; import org.eclipse.uml2.uml.Feature; import org.eclipse.uml2.uml.InstanceSpecification; import org.eclipse.uml2.uml.Package; +import org.eclipse.uml2.uml.PackageableElement; import org.eclipse.uml2.uml.Port; import org.eclipse.uml2.uml.Property; import org.eclipse.uml2.uml.Slot; @@ -54,6 +55,8 @@ import org.eclipse.uml2.uml.TemplateBinding; import org.eclipse.uml2.uml.TemplateSignature; import org.eclipse.uml2.uml.Type; import org.eclipse.uml2.uml.UMLPackage; +import org.eclipse.uml2.uml.ValueSpecification; +import org.eclipse.uml2.uml.VisibilityKind; import org.eclipse.uml2.uml.util.UMLUtil; /** @@ -78,10 +81,11 @@ public class ContainerTrafo extends AbstractContainerTrafo { * @param tmCDP * deployment plan within target model */ - public ContainerTrafo(Copy copy, Package tmCDP) { + public ContainerTrafo(Copy copy, Package tmCDP, InstanceSpecification executorIS) { this.copy = copy; this.tmCDP = tmCDP; - configureOnly = false; + this.executorIS = executorIS; + portInfo = new HashMap<Property, Port>(); } /** @@ -114,18 +118,20 @@ public class ContainerTrafo extends AbstractContainerTrafo { // model. Yet code generation works, as port names are identical for(Port port : PortUtils.getAllPorts(tmComponent)) { // copy port - Port newPort = EcoreUtil.copy(port); // don't use E3CM copy, since this is not a copy from source to target model - tmContainerImpl.getOwnedAttributes().add(newPort); - StUtils.copyStereotypes(port, newPort); - - // create delegation for application port - Connector containerDelegation = tmContainerImpl.createOwnedConnector("delegation " + port.getName()); //$NON-NLS-1$ - Copy.copyID(tmContainerImpl, containerDelegation); - ConnectorEnd end1 = containerDelegation.createEnd(); - end1.setRole(newPort); - ConnectorEnd end2 = containerDelegation.createEnd(); - end2.setPartWithPort(executorPart); - end2.setRole(port); + if (port.getVisibility() == VisibilityKind.PUBLIC_LITERAL) { + Port newPort = EcoreUtil.copy(port); // don't use E3CM copy, since this is not a copy from source to target model + tmContainerImpl.getOwnedAttributes().add(newPort); + StUtils.copyStereotypes(port, newPort); + + // create delegation for application port + Connector containerDelegation = tmContainerImpl.createOwnedConnector("delegation " + port.getName()); //$NON-NLS-1$ + Copy.copyID(tmContainerImpl, containerDelegation); + ConnectorEnd end1 = containerDelegation.createEnd(); + end1.setRole(newPort); + ConnectorEnd end2 = containerDelegation.createEnd(); + end2.setPartWithPort(executorPart); + end2.setRole(port); + } } // Inheritance issues: @@ -171,32 +177,62 @@ public class ContainerTrafo extends AbstractContainerTrafo { * Additional information about the container that is used by instance configurators */ @Override - public void createContainerInstance(Class tmComponent, InstanceSpecification tmIS, ContainerContext context) throws TransformationException { + public InstanceSpecification createContainerInstance(Class tmComponent, InstanceSpecification tmIS, ContainerContext context) throws TransformationException { // create an instance specification for the container - containerIS = (InstanceSpecification)tmCDP.createPackagedElement(tmIS.getName(), UMLPackage.eINSTANCE.getInstanceSpecification()); + InstanceSpecification containerIS = + (InstanceSpecification)tmCDP.createPackagedElement(tmIS.getName(), UMLPackage.eINSTANCE.getInstanceSpecification()); // assign new name to original instance specification which reflects // role within containment hierarchy tmIS.setName(tmIS.getName() + "." + executorPartName); //$NON-NLS-1$ containerIS.getClassifiers().add(tmContainerImpl); // existing instance specification (tmIS) is the executor instance specification DepCreation.createSlot(containerIS, tmIS, executorPart); - executorIS = tmIS; counter = 0; // containers.put(tmComponent, this); - this.context = context; - context.executorIS = executorIS; + context.executorIS = tmIS; + EList<Slot> connectorSlots = new BasicEList<Slot>(); // now create instances for the contained elements for(Property extensionPart : tmContainerImpl.getAttributes()) { Type tmContainerExtImpl = extensionPart.getType(); if(tmContainerExtImpl instanceof Class) { - InstanceSpecification containerExtIS = DepCreation.createDepPlan(tmCDP, (Class)tmContainerExtImpl, containerIS.getName() + "." + //$NON-NLS-1$ - extensionPart.getName(), false); - // configure extension - InstanceConfigurator.configureInstance(containerExtIS, extensionPart, null); - DepCreation.createSlot(containerIS, containerExtIS, extensionPart); + if (DepUtils.getSlot(executorIS, extensionPart) == null) { + // no slot for part exists => assume that the part has been added by the container and create an instance specification for it. + String isName; + InstanceSpecification containerExtIS = null; + if(Utils.isSingleton((Class)tmContainerExtImpl)) { + // is a singleton - exactly one instance exists + // use a common instance prefix for singletons + isName = DeployConstants.singletonPrefix + extensionPart.getName(); + PackageableElement pe = tmCDP.getPackagedElement(isName); + if (pe instanceof InstanceSpecification) { + containerExtIS = (InstanceSpecification) pe; + } + } + else { + isName = containerIS.getName() + "." + extensionPart.getName(); //$NON-NLS-1$ + } + if (containerExtIS == null) { + containerExtIS = DepCreation.createDepPlan(tmCDP, (Class)tmContainerExtImpl, isName, false); + } + // configure extension + context.port = portInfo.get(extensionPart); + InstanceConfigurator.configureInstance(containerExtIS, extensionPart, context); + Slot partSlot = DepCreation.createSlot(containerIS, containerExtIS, extensionPart); + if (StereotypeUtil.isApplied(tmContainerExtImpl, InteractionComponent.class)) { + connectorSlots.add(partSlot); + } + } } - } + } + + // handle propagation of node allocation for connectors. Do that in 2nd loop, since the allocation + // of parts might be incomplete before. + for(Slot connectorSlot : connectorSlots) { + ConnectorReification.propagateNodeAllocation(tmContainerImpl, containerIS, connectorSlot); + } + moveSlots(executorIS); + return containerIS; } /** @@ -205,17 +241,27 @@ public class ContainerTrafo extends AbstractContainerTrafo { * @param tmComponent * @param tmIS */ - public void createHwContainerInstance(Class tmComponent, InstanceSpecification tmNode, ContainerContext context) { + public InstanceSpecification createHwContainerInstance(Class tmComponent, InstanceSpecification tmNode, ContainerContext context) { // create an instance specification for the container - containerIS = (InstanceSpecification)tmCDP.createPackagedElement(tmNode.getName() + hwContainerPostfix, UMLPackage.eINSTANCE.getInstanceSpecification()); + InstanceSpecification containerIS = + (InstanceSpecification)tmCDP.createPackagedElement(tmNode.getName() + hwContainerPostfix, UMLPackage.eINSTANCE.getInstanceSpecification()); // assign new name to original instance specification which reflects // role within containment hierarchy containerIS.getClassifiers().add(tmContainerImpl); // containers.put(tmComponent, this); counter = 0; executorIS = tmNode; - this.context = context; context.executorIS = executorIS; + // copy slots from HW instance specification + for (Slot slot : tmNode.getSlots()) { + Slot slotCopy = containerIS.createSlot(); + slotCopy.setDefiningFeature(slot.getDefiningFeature()); + // copy values (use CopyTo.copyTo(slot, containerIS) instead?) + for (ValueSpecification value : slot.getValues()) { + Copy.copyValue(value, slotCopy); + } + } + return containerIS; } /** @@ -283,7 +329,7 @@ public class ContainerTrafo extends AbstractContainerTrafo { } else { Property extensionPart = - expandAggregationExtension(part.getName(), extOrInterceptor, tmComponent); + expandAggregationExtension(part, extOrInterceptor, tmComponent); // register relation to facilitate connector copy copy.setPackageTemplate(smContainerRule.getBase_Class(), tmContainerImpl); copy.putPair(part, extensionPart); @@ -325,7 +371,7 @@ public class ContainerTrafo extends AbstractContainerTrafo { org.eclipse.papyrus.FCM.Connector fcmConn = StUtils.getConnector(connector); if(fcmConn != null) { ConnectorReification.reifyConnector(copy, tmContainerImpl, - UMLTool.varName(connector), connector, containerIS, null); + UMLTool.varName(connector), connector, executorIS, null); } else { copy.remove(connector); @@ -342,42 +388,31 @@ public class ContainerTrafo extends AbstractContainerTrafo { * application component also inherits from the type of the container * extension in order to avoid copying ports. */ - Property expandAggregationExtension(String name, Class smContainerExtImpl, Class tmComponent) throws TransformationException { + Property expandAggregationExtension(Property smExtensionPart, Class smContainerExtImpl, Class tmComponent) throws TransformationException { Property extensionPart; + String name = smExtensionPart.getName(); Class tmContainerExtImpl = null; - if(configureOnly) { - extensionPart = tmContainerImpl.getAttribute(name, null); - if((extensionPart != null) && extensionPart.getType() instanceof Class) { - tmContainerExtImpl = (Class)extensionPart.getType(); - } + + TemplateSignature signature = TemplateUtils.getSignature(smContainerExtImpl); + if(signature == null) { + // no template signature, just copy the container extension into the target model + tmContainerExtImpl = copy.getCopy(smContainerExtImpl); + } else { + // template signature found, instantiate container extension via the + // template binding mechanism + TemplateBinding binding = TemplateUtils.fixedBinding(copy.target, smContainerExtImpl, tmComponent); + Object[] args = new Object[]{}; + TemplateInstantiation ti = new TemplateInstantiation(copy, binding, args); + tmContainerExtImpl = (Class)ti.bindNamedElement(smContainerExtImpl); } - else { - TemplateSignature signature = TemplateUtils.getSignature(smContainerExtImpl); - if(signature == null) { - // no template signature, just copy the container extension into the target model - tmContainerExtImpl = copy.getCopy(smContainerExtImpl); - } else { - // template signature found, instantiate container extension via the - // template binding mechanism - TemplateBinding binding = TemplateUtils.fixedBinding(copy.target, smContainerExtImpl, tmComponent); - Object[] args = new Object[]{}; - TemplateInstantiation ti = new TemplateInstantiation(copy, binding, args); - tmContainerExtImpl = (Class)ti.bindNamedElement(smContainerExtImpl); - } - // add part associated with the extension to the container - extensionPart = tmContainerImpl.createOwnedAttribute(name, tmContainerExtImpl); - } - // problem: would not be unique in case of multiple extensions - // Copy.copyID(tmComponent, extensionPart, "a"); - extensionPart.setIsComposite(true); - // TODO separation of container creation and instance creation - InstanceSpecification containerExtIS = DepCreation.createDepPlan(tmCDP, tmContainerExtImpl, containerIS.getName() + "." + extensionPart.getName(), false); //$NON-NLS-1$ - // configure extension - context.port = null; - InstanceConfigurator.configureInstance(containerExtIS, extensionPart, context); - DepCreation.createSlot(containerIS, containerExtIS, extensionPart); + // add part associated with the extension to the container + extensionPart = tmContainerImpl.createOwnedAttribute(name, tmContainerExtImpl); + // Copy.copyID(tmComponent, extensionPart, "a"); + extensionPart.setAggregation(smExtensionPart.getAggregation()); + Copy.copyMultElemModifiers(smExtensionPart, extensionPart); + Copy.copyFeatureModifiers(smExtensionPart, extensionPart); return extensionPart; } @@ -421,53 +456,37 @@ public class ContainerTrafo extends AbstractContainerTrafo { Property connectorPart; String interceptionName = interceptorName + port.getName() + counter; - if(configureOnly) { - // counter is reset before instance configuration - connectorPart = tmContainerImpl.getAttribute(interceptionName, null); - } - else { - Connector interceptionConnector = null; - // get delegation connector - for(Connector connector : tmContainerImpl.getOwnedConnectors()) { - if(ConnectorUtils.connectsPort(connector, port)) { - interceptionConnector = connector; - break; - } - } - // interceptionConnector = tmContainerImpl.getOwnedConnector - // ("delegation " + port.getName ()); - if(interceptionConnector == null) { - throw new TransformationException(Messages.ContainerTrafo_CannotFindDelegationConn); + Connector interceptionConnector = null; + // get delegation connector + for(Connector connector : tmContainerImpl.getOwnedConnectors()) { + if(ConnectorUtils.connectsPort(connector, port)) { + interceptionConnector = connector; + break; } - - interceptionConnector.setName(interceptorName + port.getName() + counter); - org.eclipse.papyrus.FCM.Connector fcmConn = StereotypeUtil.applyApp(interceptionConnector, org.eclipse.papyrus.FCM.Connector.class); - InteractionComponent fcmConnType = UMLUtil.getStereotypeApplication(smContainerConnImpl, InteractionComponent.class); - fcmConn.setIc(fcmConnType); - - // pass target component and port to interceptor (not clean, define - // suitable template signature as for instance in methodCall_comp - Object[] args = new Object[]{ executorIS, port }; - TransformationContext.instance = executorIS; - TransformationContext.port = port; - connectorPart = ConnectorReification.reifyConnector(copy, tmContainerImpl, UMLTool.varName(interceptionConnector), interceptionConnector, executorIS, args); - connectorParts.add(connectorPart); - TransformationContext.port = null; - // delete intermediate connector (has been replaced by two - // connections to the reified connector) - interceptionConnector.destroy(); } - // Now create an instance specification for the reified connector - InstanceSpecification reifiedConnectorIS = DepCreation.createDepPlan(tmCDP, (Class)connectorPart.getType(), - containerIS.getName() + "." + interceptionName, false); //$NON-NLS-1$ - // configure connector - context.port = port; - InstanceConfigurator.configureInstance(reifiedConnectorIS, connectorPart, context); - - Slot partSlot = DepCreation.createSlot(containerIS, reifiedConnectorIS, connectorPart); - + // interceptionConnector = tmContainerImpl.getOwnedConnector + // ("delegation " + port.getName ()); + if(interceptionConnector == null) { + throw new TransformationException(Messages.ContainerTrafo_CannotFindDelegationConn); + } - ConnectorReification.propagateNodeAllocation(tmComponent, executorIS, partSlot); + interceptionConnector.setName(interceptorName + port.getName() + counter); + org.eclipse.papyrus.FCM.Connector fcmConn = StereotypeUtil.applyApp(interceptionConnector, org.eclipse.papyrus.FCM.Connector.class); + InteractionComponent fcmConnType = UMLUtil.getStereotypeApplication(smContainerConnImpl, InteractionComponent.class); + fcmConn.setIc(fcmConnType); + + // pass target component and port to interceptor (not clean, define + // suitable template signature as for instance in methodCall_comp + Object[] args = new Object[]{ executorIS, port }; + TransformationContext.instance = executorIS; + TransformationContext.port = port; + connectorPart = ConnectorReification.reifyConnector(copy, tmContainerImpl, UMLTool.varName(interceptionConnector), interceptionConnector, executorIS, args); + connectorParts.add(connectorPart); + TransformationContext.port = null; + portInfo.put(connectorPart, port); + // delete intermediate connector (has been replaced by two + // connections to the reified connector) + interceptionConnector.destroy(); } counter++; return connectorParts; @@ -475,12 +494,21 @@ public class ContainerTrafo extends AbstractContainerTrafo { /** * Move a slot from the executor instance specification to an instance - * specification of an extension/interceptor This is required, since the + * specification of an extension/interceptor. This is required, since * users cannot configure containers directly. The modification is done in * the target model, i.e. the user model is not affected. + * + * Configuration is based on the idea that we can have multiple classifiers for an + * instance specification and that we add additional slots for attributes of the 2nd + * classifier which becomes "visible" after container transformation. + * Main use: configure priority of thread within container. + * + * TODO: Not clear, whether we should keep this operation, since configuration of elements that are not + * (directly) part of the user model is confusing. Application was: configuration + * of thread priorities within container. */ - public void moveSlots() { - Log.log(Status.INFO, Log.TRAFO_CONTAINER, String.format(Messages.ContainerTrafo_InfoMoveSlots, executorIS.getQualifiedName())); + public void moveSlots(InstanceSpecification containerIS) { + // Log.log(Status.INFO, Log.TRAFO_CONTAINER, String.format(Messages.ContainerTrafo_InfoMoveSlots, executorIS.getQualifiedName())); Classifier mainCl = DepUtils.getClassifier(executorIS); Iterator<Slot> slotIt = executorIS.getSlots().iterator(); while(slotIt.hasNext()) { @@ -546,27 +574,74 @@ public class ContainerTrafo extends AbstractContainerTrafo { } } + @Override + public void finalize() { + discoverServices(); + } + + /** + * Connector ports of executor with compatible ports offered by container extensions + * (runtime system) + */ + public void discoverServices() { + Type executorType = executorPart.getType(); + if (!(executorType instanceof EncapsulatedClassifier)) { + return; + } + EncapsulatedClassifier ec = (EncapsulatedClassifier) executorType; + for (Port executorPort : ec.getOwnedPorts()) { + for (Property svcPart : tmContainerImpl.getOwnedAttributes()) { + if (svcPart == executorPart) { + continue; + } + Type containerSvcType = svcPart.getType(); + if (containerSvcType instanceof EncapsulatedClassifier) { + EncapsulatedClassifier containerSvc = (EncapsulatedClassifier) containerSvcType; + for (Port svcPort : containerSvc.getOwnedPorts()) { + if (PortUtils.matches(executorPort, svcPort, true)) { + // create connector + Connector c = tmContainerImpl.createOwnedConnector("auto"); //$NON-NLS-1$ + ConnectorEnd ce1 = c.createEnd(); + ConnectorEnd ce2 = c.createEnd(); + ce1.setPartWithPort(executorPart); + ce1.setRole(executorPort); + ce2.setPartWithPort(svcPart); + ce2.setRole(svcPort); + } + } + } + } + } + } + /** * The attribute within the container that holds the executor, i.e. the * original component */ - private Property executorPart; + protected Property executorPart; /** * An instance specification of the executor in the target model (todo: should be source model instead?), i.e. * of the component before container expansion */ - private InstanceSpecification executorIS; + protected InstanceSpecification executorIS; /** * The created container implementation (prefixed with tm, since part of * target model) */ - private Class tmContainerImpl; + protected Class tmContainerImpl; /** * A counter which is used to manage unique names for interceptors (if * multiple interceptors are applied) */ - private int counter; + protected int counter; + + /** + * Store information about intercepted port. The map contains a mapping from the part representing + * a reified connector to the port that was intercepted. It is stored, since it might be used by instance + * configurators that configure the container instance. + */ + protected Map<Property, Port> portInfo; } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java index 04a4f27a410..d96b5a62a6f 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java @@ -7,7 +7,7 @@ import org.eclipse.uml2.uml.Element; /** * This class enables the copy from a source to a given target element. * It assumes that a copy has already been created, but will just not copy it... - * Unlike the @see Copy class, the element might be copied to a different placed + * Unlike the @see Copy class, the element might be copied to a different place */ public class CopyTo { /** diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java index 69cb1fa0bd9..1703501c2fa 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java @@ -111,10 +111,10 @@ public class InstantiateDepPlan { boolean generateCACOnly = (genOptions & GenerationOptions.CAC_ONLY) != 0; AcceleoDriver.clearErrors(); - Package cdp; + Package smCDP; Configuration configuration = null; if(cdpOrConfig instanceof Package) { - cdp = (Package)cdpOrConfig; + smCDP = (Package)cdpOrConfig; RuleManagement.setConfiguration(null); } else if(StereotypeUtil.isApplied(cdpOrConfig, Configuration.class)) { @@ -132,7 +132,7 @@ public class InstantiateDepPlan { }); return; } - cdp = fcmCDP.getBase_Package(); + smCDP = fcmCDP.getBase_Package(); RuleManagement.setConfiguration(configuration); } else { return; @@ -140,7 +140,7 @@ public class InstantiateDepPlan { try { EnumService.init(); - InstanceSpecification rootIS = DepUtils.getMainInstance(cdp); + InstanceSpecification rootIS = DepUtils.getMainInstance(smCDP); // Package copyCDP = dt.getCopyCDT (selectedCDP); EList<InstanceSpecification> nodes = AllocUtils.getAllNodes(rootIS); @@ -160,7 +160,7 @@ public class InstantiateDepPlan { } // 1a: create a new model (and applies same profiles / imports) - Model existingModel = cdp.getModel(); + Model existingModel = smCDP.getModel(); TransformationContext.sourceRoot = existingModel; tmpMM = createTargetModel(existingModel, monitor, existingModel.getName(), true); tmpModel = tmpMM.getModel(); @@ -190,7 +190,7 @@ public class InstantiateDepPlan { // obtain reference to CDP in target model // tmpCopy.createShallowContainer(rootIS); - Package tmCDP = (Package)tmpCopy.get(cdp); + Package tmCDP = (Package)tmpCopy.get(smCDP); ContainerTrafo.init(); MainModelTrafo mainModelTrafo = new MainModelTrafo(tmpCopy, tmCDP); @@ -231,7 +231,7 @@ public class InstantiateDepPlan { if(configuration != null) { modelName += "_" + configuration.getBase_Class().getName(); //$NON-NLS-1$ } else { - modelName += "_" + cdp.getName(); //$NON-NLS-1$ + modelName += "_" + smCDP.getName(); //$NON-NLS-1$ } ModelManagement genMM = createTargetModel(existingModel, monitor, MapUtil.rootModelName, false); Model genModel = genMM.getModel(); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java index c43533ba967..b59434d7cf3 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java @@ -77,7 +77,6 @@ public class LWContainerTrafo extends AbstractContainerTrafo { public LWContainerTrafo(Copy copy, Package tmCDP) { this.copy = copy; this.tmCDP = tmCDP; - configureOnly = false; interceptionOpMap = new HashMap<Operation, Operation>(); } @@ -116,14 +115,6 @@ public class LWContainerTrafo extends AbstractContainerTrafo { operations = new BasicEList<Operation>(smClass.getAllOperations()); } - /** - * Only configure the instances, i.e. avoid re-creating elements of the container, but create - * the UML instance specifications - */ - public void configureOnly() { - configureOnly = true; - } - public void createInstance() { } @@ -263,26 +254,14 @@ public class LWContainerTrafo extends AbstractContainerTrafo { * extension in order to avoid copying ports. */ Property expandAggregationExtension(String name, Class smContainerExtImpl, Class tmComponent) throws TransformationException { - Property extensionPart; - Class tmContainerExtImpl = null; - if(configureOnly) { - extensionPart = tmClass.getAttribute(name, null); - if((extensionPart != null) && extensionPart.getType() instanceof Class) { - tmContainerExtImpl = (Class)extensionPart.getType(); - } - } - else { - tmContainerExtImpl = expandAggregationDep(smContainerExtImpl, tmComponent); + Class tmContainerExtImpl = expandAggregationDep(smContainerExtImpl, tmComponent); + + // add part associated with the extension to the container + Property extensionPart = tmClass.createOwnedAttribute(name, tmContainerExtImpl); - // add part associated with the extension to the container - extensionPart = tmClass.createOwnedAttribute(name, tmContainerExtImpl); - } // problem: would not be unique in case of multiple extensions // Copy.copyID(tmComponent, extensionPart, "a"); extensionPart.setIsComposite(true); - // TODO separation of container creation and instance creation - // configure extension - // InstanceConfigurator.configureInstance(containerIS, extensionPart, context); return extensionPart; } @@ -364,11 +343,13 @@ public class LWContainerTrafo extends AbstractContainerTrafo { protected Map<Operation, Operation> interceptionOpMap; + /** + * @see AbstractContainerTrafo.createContainerInstance + */ @Override - public void createContainerInstance(Class tmComponent, InstanceSpecification tmIS, ContainerContext context) throws TransformationException { - containerIS = tmIS; - this.context = context; - this.context.executorIS = tmIS; + public InstanceSpecification createContainerInstance(Class tmComponent, InstanceSpecification executorIS, ContainerContext context) throws TransformationException { + InstanceSpecification containerIS = executorIS; + context.executorIS = executorIS; // TODO ... incomplete! // InstanceConfigurator.configureInstance(smContainerRule, containerIS, null, context); @@ -376,16 +357,17 @@ public class LWContainerTrafo extends AbstractContainerTrafo { for(Property extensionPart : tmComponent.getAttributes()) { Type tmContainerExtImpl = extensionPart.getType(); if(tmContainerExtImpl instanceof Class) { - if (DepUtils.getSlot(tmIS, extensionPart) == null) { + if (DepUtils.getSlot(executorIS, extensionPart) == null) { // no slot for part exists => assume that the part has been added by the container and create an instance specification for it. - } - InstanceSpecification containerExtIS = DepCreation.createDepPlan(tmCDP, (Class)tmContainerExtImpl, containerIS.getName() + "." + //$NON-NLS-1$ + InstanceSpecification containerExtIS = DepCreation.createDepPlan(tmCDP, (Class)tmContainerExtImpl, containerIS.getName() + "." + //$NON-NLS-1$ extensionPart.getName(), false); - // configure extension - InstanceConfigurator.configureInstance(containerExtIS, extensionPart, null); - DepCreation.createSlot(containerIS, containerExtIS, extensionPart); + // configure extension + InstanceConfigurator.configureInstance(containerExtIS, extensionPart, null); + DepCreation.createSlot(containerIS, containerExtIS, extensionPart); + } } - } + } + return containerIS; } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java index e01632bd9a4..f9a2d26ba26 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java @@ -203,14 +203,9 @@ public class MainModelTrafo { // the method createContainerInstance must be called for each instance of the application component // (caveat: don't mix-up with instance of Java classes of the development tool) // TODO: since we support multiple container kinds, we need to keep their container map separate! - if(containerTrafo != null) { - // create instance, if container exists already (if a container exists, all instances are - // instances of the container - containerTrafo.configureOnly(); - containerTrafo.createContainerInstance(tmComponent, tmIS, new ContainerContext(smDF, null)); - } - else { - // process container rules + InstanceSpecification containerIS = null; + if(containerTrafo == null) { + // no container exists, check rules and create eventually for(ContainerRule rule : rules) { if(RuleManagement.isRuleActive(rule)) { // at least one active rule => create container (or get previously instantiated)) @@ -219,26 +214,36 @@ public class MainModelTrafo { containerTrafo = new LWContainerTrafo(copy, tmCDP); } else { - containerTrafo = new ContainerTrafo(copy, tmCDP); + containerTrafo = new ContainerTrafo(copy, tmCDP, tmIS); } - // create container instance once for all rules (that use same container kind) containerTrafo.createContainer(smComponent, tmComponent); - containerTrafo.createContainerInstance(tmComponent, tmIS, new ContainerContext(smDF, null)); } else { // configure only?? } containerTrafo.applyRule(rule, smComponent, tmComponent); } - // TODO(?) check if rule has already been applied (don't mix-up instances/classes) + } + if (containerTrafo != null) { + containerTrafo.finalize(); } } + if (containerTrafo != null) { + // create instance of container. This is done after rule application, since + // elements that are added by the rules need to be instantiated as well. + // TODO: Cannot mix both rules. + containerIS = containerTrafo.createContainerInstance(tmComponent, tmIS, new ContainerContext(copy, smIS, smDF, null)); + } + // ------------------- end of container handling of SW nodes + // copy node allocation for(InstanceSpecification smNode : AllocUtils.getNodes(smIS)) { InstanceSpecification tmNode = copy.getCopy(smNode); AllocUtils.allocate(tmIS, tmNode); if(!nodeHandled.containsKey(tmNode)) { + // check if node (on an instance level) has already been treated. This is required, since many + // instances might be allocated to the same node. nodeHandled.put(tmNode, true); // check, whether a container rule is applied on the tmNode @@ -249,65 +254,58 @@ public class MainModelTrafo { if(hwRules.size() > 0) { - AbstractContainerTrafo abstractNodeContainerTrafo = ContainerTrafo.get((Class)tmCS); - if(abstractNodeContainerTrafo instanceof ContainerTrafo) { - - ContainerTrafo nodeContainerTrafo = (ContainerTrafo)abstractNodeContainerTrafo; - // make copy of inheritedRule list (avoid that added elements remain in single rule list passed to all) - - // issues - // - unlike SW component container, don't update references pointing towards the HW node - // - create additional part in system (top-level) component for the node container - // - container (_cc class) appears in platform component (same package as HW node) - // - port copying and creation of delegation connectors does not make much sense, creation of - // executor itself does not make much sense, additional operation "createHwContainer" - - // obtain property related to node instance - Slot smNodeSlot = DepUtils.getParentSlot(smNode); - ContainerContext context = new ContainerContext(smDF, smNodeSlot != null ? smNodeSlot.getDefiningFeature() : null); - - if(nodeContainerTrafo != null) { - // only create instance, if container exists already - nodeContainerTrafo.configureOnly(); - nodeContainerTrafo.createHwContainerInstance(tmComponent, tmNode, context); - } - - Package smCDP = smIS.getNearestPackage(); - DeploymentPlan smFCM_CDP = UMLUtil.getStereotypeApplication(smCDP, DeploymentPlan.class); - + ContainerTrafo nodeContainerTrafo = (ContainerTrafo) ContainerTrafo.get((Class)tmCS); + + // issues + // - unlike SW component container, don't update references pointing towards the HW node + // - create additional part in system (top-level) component for the node container + // - container (_cc class) appears in platform component (same package as HW node) + // - port copying and creation of delegation connectors does not make much sense, creation of + // executor itself does not make much sense, additional operation "createHwContainer" + + // obtain property related to node instance + Slot smNodeSlot = DepUtils.getParentSlot(smNode); + ContainerContext context = new ContainerContext(copy, smIS, smDF, smNodeSlot != null ? smNodeSlot.getDefiningFeature() : null); + Package smCDP = smIS.getNearestPackage(); + DeploymentPlan smFCM_CDP = UMLUtil.getStereotypeApplication(smCDP, DeploymentPlan.class); + + if(nodeContainerTrafo == null) { + // container does not exist, check rules and create eventually for(ContainerRule rule : hwRules) { if(RuleManagement.isRuleActive(rule)) { if(nodeContainerTrafo == null) { // at least one active rule => create container (or get previously instantiated)) - nodeContainerTrafo = new ContainerTrafo(copy, tmCDP); + nodeContainerTrafo = new ContainerTrafo(copy, tmCDP, tmIS); nodeContainerTrafo.createHwContainer((Class)tmCS); - nodeContainerTrafo.createHwContainerInstance(tmComponent, tmNode, context); - } - nodeContainerTrafo.applyRule(rule, smComponent, tmComponent); - - // now add attribute in system (obtain via classifier of main instance in smCDP) - if(smFCM_CDP != null) { - InstanceSpecification smMI = smFCM_CDP.getMainInstance(); - Classifier smSystem = DepUtils.getClassifier(smMI); - Classifier tmSystem = copy.getCopy(smSystem); - InstanceSpecification tmMI = DepUtils.getInstanceForClassifier(tmCDP, tmSystem); - if(tmSystem instanceof Class) { - Property hwcPart = - ((Class)tmSystem).createOwnedAttribute(smNode.getName() + HW_COMP_PREFIX, nodeContainerTrafo.getContainer()); - // and now create a slot for the created instance. - DepPlanUtils.createSlot(tmCDP, tmMI, nodeContainerTrafo.getContainerIS(), hwcPart); - } + nodeContainerTrafo.applyRule(rule, smComponent, tmComponent); } - - // now allocate instance - AllocUtils.allocate(nodeContainerTrafo.getContainerIS(), tmNode); } } } + if (nodeContainerTrafo != null) { + InstanceSpecification hwContainerIS = + nodeContainerTrafo.createHwContainerInstance(tmComponent, tmNode, context); + // now add attribute in system (obtain via classifier of main instance in smCDP) + if(smFCM_CDP != null) { + InstanceSpecification smMI = smFCM_CDP.getMainInstance(); + Classifier smSystem = DepUtils.getClassifier(smMI); + Classifier tmSystem = copy.getCopy(smSystem); + InstanceSpecification tmMI = DepUtils.getInstanceForClassifier(tmCDP, tmSystem); + if(tmSystem instanceof Class) { + Property hwcPart = + ((Class)tmSystem).createOwnedAttribute(smNode.getName() + HW_COMP_PREFIX, nodeContainerTrafo.getContainer()); + // and now create a slot for the created instance. + DepPlanUtils.createSlot(tmCDP, tmMI, hwContainerIS, hwcPart); + } + + // now allocate instance + AllocUtils.allocate(hwContainerIS, tmNode); + } + } } } } - } // ------------------- handling of HW nodes + } // ------------------- end of container handling of HW nodes // reread instName (may have been changed by container transformation). @@ -418,13 +416,13 @@ public class MainModelTrafo { */ } - // configure connector - InstanceConfigurator.configureInstance(tmReifiedConnectorIS, connectorPart, null); - Slot partSlot = DepCreation.createSlot(tmIS, tmReifiedConnectorIS, connectorPart); ConnectorReification.propagateNodeAllocation(tmComponent, tmIS, partSlot); + + // configure connector + InstanceConfigurator.configureInstance(tmReifiedConnectorIS, connectorPart, null); } } } @@ -444,10 +442,9 @@ public class MainModelTrafo { AllocTransfo at = new AllocTransfo(); at.transformAllocs(copy, tmComponent); - if(containerTrafo != null) { + if(containerIS != null) { // return containerIS - containerTrafo.moveSlots(); - return containerTrafo.getContainerIS(); + return containerIS; } else { return tmIS; } @@ -455,7 +452,13 @@ public class MainModelTrafo { protected Map<InstanceSpecification, Boolean> nodeHandled; - protected Copy copy; + /** + * Copier from source to target model + */ + protected Copy copy; + /** + * deployment plan within target model + */ protected Package tmCDP; } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java index 88a590a6082..241d4711342 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java @@ -19,6 +19,7 @@ import java.util.Iterator; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.papyrus.FCM.DerivedElement; +import org.eclipse.papyrus.qompass.designer.core.Messages; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.NamedElement; @@ -67,7 +68,7 @@ public class UpdateUtils { de.setSource(source); } else { - throw new TransformationRTException("cannot apply FCM stereotype. Check whether profile is applied"); + throw new TransformationRTException(Messages.UpdateUtils_CannotApplyFCMstereo); } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF index a5eb0cfb211..935f9860a62 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF @@ -43,3 +43,4 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %providerName
Bundle-Localization: plugin
+Export-Package: org.eclipse.papyrus.qompass.designer.ui.handlers
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java index b76f719b1f6..debfcb26bab 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java @@ -24,6 +24,7 @@ import org.eclipse.papyrus.FCM.DeploymentPlan; import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource; import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; +import org.eclipse.papyrus.qompass.designer.core.ElementFilter; import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.qompass.designer.core.commands.AddMarteAndFcmProfile; import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils; @@ -50,27 +51,13 @@ import org.eclipse.uml2.uml.Package; import org.eclipse.uml2.uml.util.UMLUtil; /** - * Select a connector type and implementation (group) - * TODO: show information about the used connector [usage, implem properties, ...] - * similar help for ports? + * Allocate elements in a deployment plan to a node or thread * - * @author ansgar - * - */ - -/* - * ListSelectionDialog lsd = new ListSelectionDialog(window.getShell(), list, new ArrayContentProvider(), new LabelProvider(), - * "ListSelectionDialog Message"); - * lsd.setInitialSelections(list.toArray()); - * lsd.setTitle("Select # of Nobel Prize Nominations :"); - * lsd.open(); */ public class AllocationDialog extends SelectionStatusDialog { private DeploymentPlan m_cdp; - // protected EList<Package> visitedPackages; - // protected FilteredList fRules; private Tree fTree; private Label fLabel; @@ -85,10 +72,34 @@ public class AllocationDialog extends SelectionStatusDialog { super(parent); // m_cdp = cdp; m_cdp = UMLUtil.getStereotypeApplication(cdp, DeploymentPlan.class); - visitedPackages = new BasicEList<Package>(); nodeOrThreadList = new BasicEList<InstanceSpecification>(); nodeOrThreadList.add(null); // dummy entry for no allocation - getAllNodesOrThreads(cdp.getModel(), nodeOrThreadList); + DepUtils.getAllInstances(cdp.getModel(), nodeOrThreadList, new ElementFilter() { + + public boolean acceptElement(Element element) { + if (element instanceof InstanceSpecification) { + InstanceSpecification instance = (InstanceSpecification) element; + if (instance.getName() == null) { + // donn't allocate to root element (detectable via the empty name) + return false; + } + Classifier cl = DepUtils.getClassifier(instance); + if(cl instanceof Class) { + if(StereotypeUtil.isApplied(cl, SwSchedulableResource.class)) { + // threads are valid allocation targets. Therefore, threads are always added to + // list, even if within a deployment plan. + return true; + } + if (StereotypeUtil.isApplied(instance.getNearestPackage(), DeploymentPlan.class)) { + // instance is part of a deployment plan => don't add to list. + return false; + } + return true; + } + } + return false; + } + }); } /** @@ -174,7 +185,7 @@ public class AllocationDialog extends SelectionStatusDialog { InstanceSpecification is = (InstanceSpecification)data; String name = is.getName(); - int index = name.lastIndexOf("."); + int index = name.lastIndexOf("."); //$NON-NLS-1$ if(index != -1) { name = name.substring(index + 1); } @@ -182,26 +193,26 @@ public class AllocationDialog extends SelectionStatusDialog { Classifier cl = DepUtils.getClassifier(is); String nodeName; if(explicitNodeOrThread == null) { - nodeName = "-"; + nodeName = "-"; //$NON-NLS-1$ } else { nodeName = getAllocName(explicitNodeOrThread); } if(cl instanceof Class) { if(BootLoaderGen.hasUnconnectedStartRoutine(null, (Class)cl, null)) { - nodeName += " (main)"; + nodeName += " (main)"; //$NON-NLS-1$ } } EList<InstanceSpecification> implicitNodes = AllocUtils.getAllNodesOrThreadsParent(is); implicitNodes.addAll(AllocUtils.getAllNodesOrThreadsParent(is)); - String list = ""; + String list = ""; //$NON-NLS-1$ for(InstanceSpecification node : implicitNodes) { - if(list.equals("")) { + if(list.equals("")) { //$NON-NLS-1$ list = getAllocName(node); } else { - list += ", " + getAllocName(node); + list += ", " + getAllocName(node); //$NON-NLS-1$ } } - ti.setText(new String[]{ name, nodeName, "[" + list + "]" }); + ti.setText(new String[]{ name, nodeName, "[" + list + "]" }); //$NON-NLS-1$//$NON-NLS-2$ } } @@ -294,28 +305,4 @@ public class AllocationDialog extends SelectionStatusDialog { AllocUtils.updateAllocation(is, oldNode, newNode); } } - - void getAllNodesOrThreads(Package pkg, EList<InstanceSpecification> nodeList) { - for(Element el : pkg.getMembers()) { - if(el instanceof Package) { - if(!visitedPackages.contains(el)) { - visitedPackages.add((Package)el); - getAllNodesOrThreads((Package)el, nodeList); - } - } else if(el instanceof InstanceSpecification) { - Classifier cl = DepUtils.getClassifier((InstanceSpecification)el); - if(cl != null) { - if((cl instanceof Class) || (StereotypeUtil.isApplied(cl, SwSchedulableResource.class))) { - // check that instances are not part of a deployment plan - // [TODO:] check that owner of instance is a platform definition - if(!StereotypeUtil.isApplied(el.getOwner(), DeploymentPlan.class)) { - nodeList.add((InstanceSpecification)el); - } - } - } - } - } - } - - private EList<Package> visitedPackages; } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java index 43e26f29a01..cb7d43f6274 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java @@ -31,11 +31,11 @@ import org.eclipse.papyrus.FCM.ContainerRule; import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils; import org.eclipse.papyrus.qompass.designer.core.ConfigUtils; import org.eclipse.papyrus.qompass.designer.core.Description; +import org.eclipse.papyrus.qompass.designer.core.ElementFilter; import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation; import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils; import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils; -import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants; import org.eclipse.papyrus.qompass.designer.core.sync.DepPlanSync; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; import org.eclipse.swt.SWT; @@ -62,7 +62,6 @@ import org.eclipse.uml2.uml.LiteralBoolean; import org.eclipse.uml2.uml.LiteralInteger; import org.eclipse.uml2.uml.LiteralString; import org.eclipse.uml2.uml.Package; -import org.eclipse.uml2.uml.PackageableElement; import org.eclipse.uml2.uml.Property; import org.eclipse.uml2.uml.Slot; import org.eclipse.uml2.uml.Type; @@ -157,9 +156,51 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog { return false; } - /** - * retrieve the instance list. Returns false, if no deploymentplan could be found. + * A filter class that selects instances associated with the selected feature or component + */ + class InstanceFilter implements ElementFilter { + + private String featureCandidateName; + + public boolean acceptElement(Element element) { + if(element instanceof InstanceSpecification) { + InstanceSpecification instance = (InstanceSpecification)element; + if(m_feature instanceof Property) { + EList<Slot> slots = DepUtils.getReferencingSlots(instance); + for (Slot slot : slots) { + if(slot.getDefiningFeature() == m_feature) { + return true; + } + } + } + else if(m_feature instanceof Connector) { + // Connector instances cannot be found via a slot. Since a connector is not a structural feature, + // it cannot be referenced via the "definingFeature" property of a slot. Therefore, the deployment + // plan creation (@see DepCreation.createDepPlan) simply omits slots, but still creates instances + // for the interaction components referenced by an FCM connector. + // TODO: the following code relies on specific order of instances and might not always work. + Element owner = m_feature.getOwner(); + if(DepUtils.getImplementation(instance) == owner) { + // instance is for owner of feature: examine name + featureCandidateName = instance.getName() + "." + m_feature.getName(); //$NON-NLS-1$ + } + else if(featureCandidateName != null) { + if(featureCandidateName.equals(instance.getName())) { + return true; + } + } + } else if(DepUtils.getImplementation(instance) == m_component) { + return true; + } + } + return false; + } + } + + + /** + * retrieve the instance list. Returns false, if no deployment plan could be found. * * @return */ @@ -167,7 +208,9 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog { visitedPackages = new BasicEList<Package>(); m_instanceList = new BasicEList<InstanceSpecification>(); - getInstances(m_instanceList); + ElementFilter filter = new InstanceFilter(); + DepUtils.getAllInstances(m_model, m_instanceList, filter); + if(m_instanceList.size() == 0) { Shell shell = new Shell(); if(DepPlanUtils.getAllDepPlans(m_model).size() == 0) { @@ -179,7 +222,8 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog { "The list of available instances is empty. Synchronize deployment plans?")) { DepPlanSync.syncAllDepPlans(m_model); visitedPackages = new BasicEList<Package>(); - getInstances(m_instanceList); + DepUtils.getAllInstances(m_model, m_instanceList, filter); + if(m_instanceList.size() == 0) { MessageDialog.openInformation(shell, "Instance configuration", "There are still no instances available\n. Check whether you created already a deployment plan for your system. Check as well, if the parts in your a composite use \"composite\" as aggregation kind. (Results of deployment plan synchronizations will be unrolled)"); @@ -453,54 +497,11 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog { private String getValueLabel(Property attribute) { String label = valueLabelPrefix; if(attribute.getDefault() != null) { - return label + " " + String.format("(default = %s)", attribute.getDefault()); //$NON-NLS-1$ + return label + " " + String.format("(default = %s)", attribute.getDefault()); //$NON-NLS-1$ //$NON-NLS-2$ } return label; } - // TODO(?): need a generic utility function for getting all elements obeying a - // certain criteria from a model - void getInstances(EList<InstanceSpecification> instanceList) { - Package deploymentPlans = Utils.getRoot(m_model, DeployConstants.depPlanFolder); - String featureCandidateName = null; - if(deploymentPlans == null) { - return; - } - for(PackageableElement deploymentPlan : deploymentPlans - .getPackagedElements()) { - if(deploymentPlan instanceof Package) { - for(PackageableElement instance : ((Package)deploymentPlan).getPackagedElements()) { - if(instance instanceof InstanceSpecification) { - InstanceSpecification candidate = (InstanceSpecification)instance; - if(m_feature instanceof Property) { - for(Slot slot : candidate.getSlots()) { - if(slot.getDefiningFeature() == m_feature) { - instanceList - .add(DepUtils.getInstance(slot)); - } - } - } else if(m_feature instanceof Connector) { - // Connector cannot be found directly, since there is no slot in containing composite (defining - // feature is a structural-feature, not a feature): find via name. - Element owner = m_feature.getOwner(); - if(DepUtils.getImplementation(candidate) == owner) { - // instance is for owner of feature: examine name - featureCandidateName = candidate.getName() + "." + m_feature.getName(); //$NON-NLS-1$ - } - else if(featureCandidateName != null) { - if(featureCandidateName.equals(candidate.getName())) { - instanceList.add(candidate); - } - } - } else if(DepUtils.getImplementation(candidate) == m_component) { - instanceList.add(candidate); - } - } - } - } - } - } - private EList<Property> getConfigAttributes(Classifier component) { EList<Property> list = new BasicEList<Property>(); // add properties of component diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java index 5cf8b6d2739..6eb386d22b2 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java @@ -20,6 +20,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.papyrus.qompass.designer.core.CommandSupport; import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation; +import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException; import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationRTException; import org.eclipse.swt.widgets.Shell; @@ -55,12 +56,12 @@ public class CreatePlatformHandler extends CmdHandler { public void run() { // execute with transaction support - platform = Utils.getRoot(selectedComposite, "PlatformModel");//$NON-NLS-1$ + platform = Utils.getRoot(selectedComposite, DeployConstants.depPlanFolderHw); } }); - final String newPlatform = selectedComposite.getName() + "Platform"; //$NON-NLS-1$ - + final String newPlatform = selectedComposite.getName() + DeployConstants.DepPlanPostfixHw; + try { if(platform.getMember(newPlatform) != null) { Shell shell = new Shell(); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java index e3b26d9ff05..14bd6a9545d 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java @@ -18,9 +18,13 @@ import com.google.inject.Injector; public class ParseVSL { + private static final String UNIT = "unit"; //$NON-NLS-1$ + + private static final String VALUE = "value"; //$NON-NLS-1$ + private Injector injector; - private static final String SYNTHETIC_SCHEME = "synthetic"; + private static final String SYNTHETIC_SCHEME = "synthetic"; //$NON-NLS-1$ /** @@ -41,7 +45,7 @@ public class ParseVSL { IGrammarAccess grammarAccess = injector.getInstance(IGrammarAccess.class); XtextResource xtextResource = (XtextResource)resourceFactory.createResource( - URI.createURI(SYNTHETIC_SCHEME + ":/" + grammarAccess.getGrammar().getName() + ".vsl")); + URI.createURI(SYNTHETIC_SCHEME + ":/" + grammarAccess.getGrammar().getName() + ".vsl")); //$NON-NLS-1$ //$NON-NLS-2$ try { xtextResource.load(new StringInputStream(expression, xtextResource.getEncoding()), Collections.emptyMap()); @@ -74,8 +78,8 @@ public class ParseVSL { public static int getSizeFromVSL(String nfpDatasize) { if(nfpDatasize != null) { - String unit = MarteUtils.getValueFromTuple(nfpDatasize, "unit"); - String value = MarteUtils.getValueFromTuple(nfpDatasize, "value"); + String unit = MarteUtils.getValueFromTuple(nfpDatasize, UNIT); + String value = MarteUtils.getValueFromTuple(nfpDatasize, VALUE); return Float.valueOf(value).intValue() * getMultiplicatorFromSizeUnit(unit); } return 0; @@ -92,8 +96,8 @@ public class ParseVSL { */ public static long getDurationFromVSL(String nfpDuration) { if(nfpDuration != null) { - String unit = MarteUtils.getValueFromTuple(nfpDuration, "unit"); - String value = MarteUtils.getValueFromTuple(nfpDuration, "value"); + String unit = MarteUtils.getValueFromTuple(nfpDuration, UNIT); + String value = MarteUtils.getValueFromTuple(nfpDuration, VALUE); return Float.valueOf(value).intValue() * getMultiplicatorFromTimeUnit(unit); } return 0; @@ -107,8 +111,8 @@ public class ParseVSL { */ public static long getFrequencyFromVSL(String nfpFrequency) { if(nfpFrequency != null) { - String unit = MarteUtils.getValueFromTuple(nfpFrequency, "unit"); - String value = MarteUtils.getValueFromTuple(nfpFrequency, "value"); + String unit = MarteUtils.getValueFromTuple(nfpFrequency, UNIT); + String value = MarteUtils.getValueFromTuple(nfpFrequency, VALUE); return (int)(Float.valueOf(value) * getMultiplicatorFromFrequencyUnit(unit)); } return 0; @@ -116,7 +120,7 @@ public class ParseVSL { public static long getPeriodFromArrivalPattern(String arrivalPattern) { if(arrivalPattern != null) { - String period = MarteUtils.getValueFromTuple(arrivalPattern, "period"); + String period = MarteUtils.getValueFromTuple(arrivalPattern, "period"); //$NON-NLS-1$ return getDurationFromVSL(period); } return 0; @@ -134,7 +138,7 @@ public class ParseVSL { return 1024 * 1024 * 1024; } else { // do not support bits here. - throw new RuntimeException("Error parsing VSL expression, unexpected size unit (expecting byte, kb, mb, or gb): '" + unit + "'"); + throw new RuntimeException(String.format(Messages.ParseVSL_ErrorInExp_SIZE, unit)); } } @@ -156,7 +160,7 @@ public class ParseVSL { } else if(tuk == TimeUnitKind.MIN) { return 60 * 1000 * 1000; } else { - throw new RuntimeException("Error parsing VSL expression, unexpected duration unit (expecting us, ms, s or min): '" + unit + "'"); + throw new RuntimeException(String.format(Messages.ParseVSL_ErrorInExp_TIME, unit)); } } @@ -174,7 +178,7 @@ public class ParseVSL { return 1 / 60; } else { // do not support bits here. - throw new RuntimeException("Error parsing VSL expression, unexpected frequency unit (expecting Hz, KHz, MHz, GHz or rpm: '" + unit + "'"); + throw new RuntimeException(String.format(Messages.ParseVSL_ErrotInExp_FREQ, unit)); } } } diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo index 9f96a52a9ef..b9a612c8c60 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo @@ -18,7 +18,7 @@ <acceleoCompiler sourceFolder="${target.folder}" outputFolder="${target.folder}" - dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;" + dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;" binaryResource="false" packagesToRegister=""> </acceleoCompiler> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation index 491d471cf38..10fdf737beb 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.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:xsi="http://www.w3.org/2001/XMLSchema-instance" 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:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" 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="_XSHWMF36Ed-UvNEDwY5GNg" type="PapyrusUMLClassDiagram" name="Interfaces" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_iubEsDbcEeGdqp2YT1LwWw" type="2004" fontName="Sans Serif" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iucS0DbcEeGdqp2YT1LwWw" source="ShadowFigure"> @@ -44,6 +44,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_iudg_TbcEeGdqp2YT1LwWw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iudg_jbcEeGdqp2YT1LwWw"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TJ_EAFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TJ_EAVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TJ_EAly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Interface" href="ClientServerTimer.uml#_cn-H0DLbEd2qeKRLMdIx_A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iubEsTbcEeGdqp2YT1LwWw" x="132" y="101" width="328" height="80"/> </children> @@ -153,6 +157,15 @@ <element xmi:type="uml:Port" href="ClientServerTimer.uml#_DtWn4DLcEd2qeKRLMdIx_A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZmeH8TrdEeGgAdAmWw4pyQ" x="153" y="81"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TZhU0Fy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TZhU0Vy9EeORBN8YBc21fg" showTitle="true"/> + <element xmi:type="C_Cpp:Include" href="ClientServerTimer.uml#_7SAnAP76Ed6Zw96O-tCw7A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TZhU0ly9EeORBN8YBc21fg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TZh74Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TZh74Vy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TZh74ly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Class" href="ClientServerTimer.uml#_IfjoETLbEd2qeKRLMdIx_A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xxFIUV36Ed-UvNEDwY5GNg" x="126" y="153" width="163" height="133"/> </children> @@ -199,6 +212,10 @@ <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qjxzITenEeGPyrZ5I3hMlA" x="-10" y="27"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TZ8yoFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TZ9ZsFy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TZ9ZsVy9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lvTlsQOUEeCBk5-airPjFw" x="126" y="36" width="163" height="55"/> </children> @@ -279,6 +296,20 @@ <element xmi:type="uml:Port" href="ClientServerTimer.uml#_4KiE8DLbEd2qeKRLMdIx_A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FzA74WfbEd-T-rJ3Ep9Y5Q" x="-10" y="106"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Tb56cFy9EeORBN8YBc21fg" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Tb56cVy9EeORBN8YBc21fg" showTitle="true"/> + <element xmi:type="FCM:RuleApplication" href="ClientServerTimer.uml#_DWIYoP6yEd6Ie_kieu_3CQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tb56cly9EeORBN8YBc21fg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TcB2QFy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TcB2QVy9EeORBN8YBc21fg" showTitle="true"/> + <element xmi:type="C_Cpp:Include" href="ClientServerTimer.uml#_Sa4nEP77Ed6Zw96O-tCw7A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TcB2Qly9EeORBN8YBc21fg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TcCdUFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TcDEYFy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TcDEYVy9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Class" href="ClientServerTimer.uml#_oqZNUDLaEd2qeKRLMdIx_A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c2tKsV37Ed-UvNEDwY5GNg" x="134" y="74" width="217" height="137"/> </children> @@ -401,6 +432,10 @@ <element xmi:type="uml:Port" href="ClientServerTimer.uml#_DtWn4DLcEd2qeKRLMdIx_A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ltaATrdEeGgAdAmWw4pyQ" x="166" y="52"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Tg4hEFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Tg4hEVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tg4hEly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Property" href="ClientServerTimer.uml#_i-I7gDLiEd2RVeNawwNNzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uegu4V37Ed-UvNEDwY5GNg" x="43" y="17" width="176" height="116"/> </children> @@ -445,6 +480,10 @@ <element xmi:type="uml:Port" href="ClientServerTimer.uml#_4KiE8DLbEd2qeKRLMdIx_A"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3RXDgTrdEeGgAdAmWw4pyQ" x="-10" y="50"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_ThBD8Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ThBD8Vy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThBD8ly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Property" href="ClientServerTimer.uml#_gV1cgDLiEd2RVeNawwNNzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vHCHcV37Ed-UvNEDwY5GNg" x="369" y="19" width="188" height="112"/> </children> @@ -483,6 +522,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_1Lpe0SkDEeGDDbdzqSb4UA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Lpe0ikDEeGDDbdzqSb4UA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_ThIYsFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ThIYsVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThIYsly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_ARs_UCjaEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1LoQsSkDEeGDDbdzqSb4UA" x="22" y="10" width="172"/> </children> @@ -505,6 +548,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_1Lqs-CkDEeGDDbdzqSb4UA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Lqs-SkDEeGDDbdzqSb4UA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_ThK08Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ThLcAFy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThLcAVy9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_RMqEkCjaEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1LqF4SkDEeGDDbdzqSb4UA" x="22" y="65" width="172"/> </children> @@ -540,6 +587,10 @@ <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_3NSGwCkAEeGDDbdzqSb4UA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OEcZ0CkDEeGDDbdzqSb4UA" x="-10" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_ThFVYFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ThFVYVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThFVYly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Property" href="ClientServerTimer.uml#_lKtZUCjYEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lMUi4SjYEeGFbebITJYb9g" x="143" y="168" width="217" height="145"/> </children> @@ -573,6 +624,10 @@ </children> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sGa2Il37Ed-UvNEDwY5GNg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Tg1dwFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Tg1dwVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tg1dwly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Class" href="ClientServerTimer.uml#_bYJagDLiEd2RVeNawwNNzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sGaPEV37Ed-UvNEDwY5GNg" x="68" y="32" width="635" height="356"/> </children> @@ -657,6 +712,15 @@ <children xmi:type="notation:DecorationNode" xmi:id="_7FvsNGONEd-seu3qyZgHfg" type="7016"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FvsNWONEd-seu3qyZgHfg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TjxdAFy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TjxdAVy9EeORBN8YBc21fg" showTitle="true"/> + <element xmi:type="FCM:DeploymentPlan" href="ClientServerTimer.uml#_6dGQgP6zEd6Ie_kieu_3CQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TjxdAly9EeORBN8YBc21fg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TjyEEFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TjyEEVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TjyEEly9EeORBN8YBc21fg"/> + </children> <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_7FtP8GONEd-seu3qyZgHfg"/> <element xmi:type="uml:Package" href="ClientServerTimer.uml#_5Z7MEDLiEd2RVeNawwNNzg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FtP8WONEd-seu3qyZgHfg" x="77" y="68"/> @@ -682,6 +746,15 @@ <children xmi:type="notation:DecorationNode" xmi:id="_7zKL12ONEd-seu3qyZgHfg" type="7016"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7zKL2GONEd-seu3qyZgHfg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Tj0gUFy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Tj0gUVy9EeORBN8YBc21fg" showTitle="true"/> + <element xmi:type="FCM:DeploymentPlan" href="ClientServerTimer.uml#_bBdJUP_BEd6628OhKk_dpg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tj0gUly9EeORBN8YBc21fg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Tj1HYFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Tj1HYVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tj1HYly9EeORBN8YBc21fg"/> + </children> <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_7zJkwWONEd-seu3qyZgHfg"/> <element xmi:type="uml:Package" href="ClientServerTimer.uml#_bBSxQP_BEd6628OhKk_dpg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7zJkwmONEd-seu3qyZgHfg" x="77" y="191"/> @@ -719,6 +792,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_QU449qDjEd-rLNbSWf1QuA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QU4496DjEd-rLNbSWf1QuA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Tj4KsFy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Tj4KsVy9EeORBN8YBc21fg" showTitle="true"/> + <element xmi:type="FCM:Configuration" href="ClientServerTimer.uml#_Y10_QKDjEd-rLNbSWf1QuA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tj4Ksly9EeORBN8YBc21fg"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Tj5Y0Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Tj5Y0Vy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tj5Y0ly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Class" href="ClientServerTimer.uml#_QT6okKDjEd-rLNbSWf1QuA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QU0ngaDjEd-rLNbSWf1QuA" x="366" y="87" width="184" height="65"/> </children> @@ -849,11 +931,19 @@ <children xmi:type="notation:BasicCompartment" xmi:id="_Qgb5JcniEeCMCo5Ox2CNmg" type="7077"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qgb5JsniEeCMCo5Ox2CNmg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TmahUFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TmahUVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmahUly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Property" href="ClientServerTimer.uml#_QgKzYMniEeCMCo5Ox2CNmg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QgbSEcniEeCMCo5Ox2CNmg" x="83" y="28" width="165" height="55"/> </children> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M10BiMniEeCMCo5Ox2CNmg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TmYFEFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TmYFEVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmYFEly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Class" href="ClientServerTimer.uml#_M1a_8MniEeCMCo5Ox2CNmg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M1wXIcniEeCMCo5Ox2CNmg" x="72" y="54" width="361" height="145"/> </children> @@ -891,12 +981,20 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_eBxvODa3EeGBl4WmUxMhOA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eBxvOTa3EeGBl4WmUxMhOA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TmgA4Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TmgA4Vy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmgA4ly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Property" href="ClientServerTimer.uml#_eBgCYDa3EeGBl4WmUxMhOA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eBxIITa3EeGBl4WmUxMhOA" x="85" y="26" width="163"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_Xm1sFDa3EeGBl4WmUxMhOA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xm1sFTa3EeGBl4WmUxMhOA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_TmdkoFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_TmdkoVy9EeORBN8YBc21fg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tmdkoly9EeORBN8YBc21fg"/> + </children> <element xmi:type="uml:Class" href="ClientServerTimer.uml#_XkN14Da3EeGBl4WmUxMhOA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xmz24Ta3EeGBl4WmUxMhOA" x="72" y="240" width="361" height="130"/> </children> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml index 614741a5ac9..65055bdb134 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml @@ -16,11 +16,41 @@ <ownedAttribute xmi:type="uml:Port" xmi:id="_4KiE8DLbEd2qeKRLMdIx_A" name="p" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/> <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/> <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8CfgFy9EeORBN8YBc21fg" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8DGkFy9EeORBN8YBc21fg" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8DtoFy9EeORBN8YBc21fg" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8EUsFy9EeORBN8YBc21fg" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8Fi0Fy9EeORBN8YBc21fg" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8Fi0Vy9EeORBN8YBc21fg" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8GJ4Fy9EeORBN8YBc21fg" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8GJ4Vy9EeORBN8YBc21fg" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8Gw8Fy9EeORBN8YBc21fg" value="1"/> + </ownedParameter> <language>C/C++</language> <body>cout << "server: got add request for a=" << a << " and b=" << b << endl; return a+b;</body> </ownedBehavior> <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_I1R3YAcDEeGnrLqQ0OQeAg" name="mult" specification="_4ZEZwHecEd6r18stFZxmFQ"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8HYAFy9EeORBN8YBc21fg" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8HYAVy9EeORBN8YBc21fg" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8H_EFy9EeORBN8YBc21fg" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8H_EVy9EeORBN8YBc21fg" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8H_Ely9EeORBN8YBc21fg" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8ImIFy9EeORBN8YBc21fg" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8ImIVy9EeORBN8YBc21fg" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8JNMFy9EeORBN8YBc21fg" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8JNMVy9EeORBN8YBc21fg" value="1"/> + </ownedParameter> <language>C/C++</language> <body>cout << "server: got mult request for a=" << a << " and b=" << b << endl; return a*b;</body> @@ -56,25 +86,16 @@ return a*b;</body> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6xDLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> </ownedParameter> <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6yDLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> </ownedParameter> <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6zDLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> </ownedParameter> </ownedOperation> <ownedOperation xmi:type="uml:Operation" xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true"> @@ -82,25 +103,16 @@ return a*b;</body> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY9DLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> </ownedParameter> <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY-DLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> </ownedParameter> <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY_DLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> </ownedParameter> </ownedOperation> </packagedElement> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation index b8a16ddf749..d940e42fba9 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.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:xsi="http://www.w3.org/2001/XMLSchema-instance" 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:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:SW_Concurrency="http://www.eclipse.org/papyrus/SW_Concurrency/1" 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" xsi:schemaLocation="http://www.eclipse.org/papyrus/SW_Concurrency/1 http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Concurrency"> <notation:Diagram xmi:id="_FYAkIG4sEd-0rs2VEGIwsA" type="CompositeStructure" name="Composite Async & sync call hierarchy" measurementUnit="Pixel"> <children xmi:type="notation:Shape" xmi:id="_FYAkIW4sEd-0rs2VEGIwsA" type="2073" fontName="Sans Serif" fontHeight="10" lineColor="0"> <children xmi:type="notation:DecorationNode" xmi:id="_FYAkIm4sEd-0rs2VEGIwsA" type="5156"/> @@ -26,6 +26,10 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FYBLMm4sEd-0rs2VEGIwsA" x="110" y="45"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klFeYFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klFeYVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klFeYly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_mIpj8Ns8Ed2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FYBLM24sEd-0rs2VEGIwsA" x="225" y="90" width="120" height="84"/> </children> @@ -54,6 +58,10 @@ <element xmi:type="uml:Port" href="core.uml#_P4xVsNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FYBLPW4sEd-0rs2VEGIwsA" x="-10" y="44"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klGsgFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klGsgVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klGsgly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_j29X4NttEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FYBLPm4sEd-0rs2VEGIwsA" x="420" y="90" width="121" height="79"/> </children> @@ -129,6 +137,15 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnSuQTrVEeGMCcwsbpLuFA" x="106" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klIhsFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klIhsVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_s8OWIFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klIhsly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klIhs1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klIhtFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klIhtVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_KxQBELuXEd2TTr3gJIvazw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cTmN8G5fEd-5CZIeuHpHAg" x="225" y="270" width="116" height="76"/> </children> @@ -204,6 +221,15 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hZSdojrVEeGMCcwsbpLuFA" x="111" y="33"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klK98Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klK98Vy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_efp4QClzEd-eoo60eNyGlg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klK98ly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klK981y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klK99Fy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klK99Vy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_Whe8EClYEd-eoo60eNyGlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nkmBEW5fEd-5CZIeuHpHAg" x="225" y="390" width="121" height="73"/> </children> @@ -279,6 +305,15 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iOYSkTrVEeGMCcwsbpLuFA" x="111" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klMzIFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klMzIVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_vEYVcFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klMzIly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klNaMFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klNaMVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klNaMly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HJAqEW5gEd-5CZIeuHpHAg" x="420" y="270" width="121" height="76"/> </children> @@ -354,6 +389,15 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kf5CMTrVEeGMCcwsbpLuFA" x="111" y="33"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klPPYFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klPPYVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_wT-8IFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klPPYly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klP2cFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klP2cVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klP2cly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_jOU60A1jEd6tvthBDl600Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H_CTIW5gEd-5CZIeuHpHAg" x="420" y="390" width="121" height="70"/> </children> @@ -415,6 +459,10 @@ <element xmi:type="uml:Port" href="core.uml#_0KY1UF7pEeGEmrrwB1vhPg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5wCPMV7pEeGEmrrwB1vhPg" x="108" y="45"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klRroFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klRroVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klRroly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_0KYOQF7pEeGEmrrwB1vhPg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2oWskV7pEeGEmrrwB1vhPg" x="36" y="90" width="118" height="82"/> </children> @@ -491,6 +539,15 @@ <element xmi:type="uml:Port" href="core.uml#_P4xVsNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ewm-4V7qEeGEmrrwB1vhPg" x="-10" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klS5wFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klS5wVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_Z3Zs4F7tEeGEmrrwB1vhPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klS5wly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_klTg0Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_klTg0Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klTg0ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_TLShkF7qEeGEmrrwB1vhPg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLmDkV7qEeGEmrrwB1vhPg" x="38" y="270" width="116" height="73"/> </children> @@ -647,6 +704,20 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_ByUxPNYGEd-CgJIavLpOxQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ByUxPdYGEd-CgJIavLpOxQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kym9AFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kym9AVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="C_Cpp:Include" href="core.uml#_Q7TVYBJcEd-QgZm_R1AKbA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kym9Aly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kym9A1y8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kym9BFy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="SW_Concurrency:SwSchedulableResource" href="core.uml#_42YPYBn3EeONpa5JgejICQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kym9BVy8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kynkEFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kynkEVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kynkEly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_SiY_AP-EEd6628OhKk_dpg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ByS8AdYGEd-CgJIavLpOxQ" x="99" y="108" width="190" height="145"/> </children> @@ -683,6 +754,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_D0xxMdYGEd-CgJIavLpOxQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D0xxMtYGEd-CgJIavLpOxQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kyqnYFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kyqnYVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyqnYly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_-WNegNtxEd6nqsBVkgJEEA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D0xKEdYGEd-CgJIavLpOxQ" x="99" y="9" width="193" height="55"/> </children> @@ -736,6 +811,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_eloUI_QREeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eloUJPQREeCovO8AYZymZQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kyr1gFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kyr1gVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyr1gly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Interface" href="core.uml#_elkpwPQREeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_elme8fQREeCovO8AYZymZQ" x="459" y="201" width="208" height="82"/> </children> @@ -786,6 +865,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_S9L4GPQWEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S9L4GfQWEeCovO8AYZymZQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kytDoFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kytDoVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kytDoly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Interface" href="core.uml#_omxU4PNAEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S9Kp8fQWEeCovO8AYZymZQ" x="459" y="324" width="451" height="91"/> </children> @@ -825,6 +908,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_DZU28iUREeGXBt65HZzY7g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZU28yUREeGXBt65HZzY7g"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kyuRwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kyuRwVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyuRwly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Interface" href="core.uml#_DY2VwCUREeGXBt65HZzY7g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZUP0CUREeGXBt65HZzY7g" x="702" y="201" width="208" height="79"/> </children> @@ -857,6 +944,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_5MCgSCXQEeGX6PuSE-DJlQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5MCgSSXQEeGX6PuSE-DJlQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kyvf4Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kyvf4Vy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_OXit8CfwEeG6iME5Q8XPKw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyvf4ly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kywG8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kywG8Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kywG8ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_5J9coCXQEeGX6PuSE-DJlQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5MArESXQEeGX6PuSE-DJlQ" x="99" y="297" width="190" height="55"/> </children> @@ -904,6 +1000,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_OYRe3FaNEeKxltxu9uR4dg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OYRe3VaNEeKxltxu9uR4dg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kyxVEFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kyxVEVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyxVEly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:DataType" href="core.uml#_OU5asFaNEeKxltxu9uR4dg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OX-j4VaNEeKxltxu9uR4dg" x="702" y="9" width="208" height="64"/> </children> @@ -951,6 +1051,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_Y-AHblaNEeKxltxu9uR4dg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y-AHb1aNEeKxltxu9uR4dg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kyyjMFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kyyjMVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyyjMly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:DataType" href="core.uml#_Y8dPQFaNEeKxltxu9uR4dg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y9_gUVaNEeKxltxu9uR4dg" x="702" y="90" width="208" height="91"/> </children> @@ -1046,6 +1150,10 @@ <element xmi:type="uml:TemplateSignature" href="core.uml#_ewC6kOxIEd-2rr_yAeKkjQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkrRMa8qEeCXIcykFPsB8Q" x="30" y="8"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kAPE4Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kAPE4Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kAPE4ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Package" href="core.uml#_RPCMoOxIEd-2rr_yAeKkjQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLyysa8qEeCXIcykFPsB8Q" x="90" y="243"/> </children> @@ -1122,11 +1230,24 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_V95nmq8sEeCXIcykFPsB8Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V95nm68sEeCXIcykFPsB8Q"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kCfHoFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kCfHoVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_s8OWIFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCfHoly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kCfusFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kCfusVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCfusly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_KxQBELuXEd2TTr3gJIvazw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V94ZcK8sEeCXIcykFPsB8Q" x="16" y="10" height="43"/> </children> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmLiRa8sEeCXIcykFPsB8Q"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kCegkFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kCegkVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCegkly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Package" href="core.uml#_ZISNcIQzEd2_fLv04swWfw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmKUIa8sEeCXIcykFPsB8Q" x="13" y="28" width="190"/> </children> @@ -1168,11 +1289,24 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_bgkl_a8sEeCXIcykFPsB8Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bgkl_q8sEeCXIcykFPsB8Q"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kChj4Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kChj4Vy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_vEYVcFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kChj4ly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kCiK8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kCiK8Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCiK8ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bgjX0a8sEeCXIcykFPsB8Q" x="15" y="7" height="51"/> </children> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UgOvuK8sEeCXIcykFPsB8Q" x="48" y="4" width="200" height="80"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kCg80Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kCg80Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCg80ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Package" href="core.uml#_RjvvcA1jEd6tvthBDl600Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UgOIoa8sEeCXIcykFPsB8Q" x="229" y="28" width="190"/> </children> @@ -1200,6 +1334,10 @@ <element xmi:type="uml:TemplateSignature" href="core.uml#_V0b2APfBEd2TbIfwytOyPA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q9rCka8rEeCXIcykFPsB8Q" x="40" y="10"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kCdScFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kCdScVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCdScly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Package" href="core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NLTmAa8rEeCXIcykFPsB8Q" x="90" y="108" width="451" height="181"/> </children> @@ -1267,6 +1405,10 @@ <element xmi:type="uml:Port" href="core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UfT48babEeCj_-LEBuGpmA" x="-10" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kEpq0Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kEpq0Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kEpq0ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PlQZwbabEeCj_-LEBuGpmA" x="144" y="72" width="163" height="73"/> </children> @@ -1310,6 +1452,10 @@ <element xmi:type="uml:Port" href="core.uml#__SLXgNtxEd6nqsBVkgJEEA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_atcPIbabEeCj_-LEBuGpmA" x="-10" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kErgAFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kErgAVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kErgAly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_-WNegNtxEd6nqsBVkgJEEA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHPsgbabEeCj_-LEBuGpmA" x="144" y="180" width="163" height="73"/> </children> @@ -1369,6 +1515,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_09wnmbnYEeCxXoyQxQ47PQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_09wnmrnYEeCxXoyQxQ47PQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIOjQFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIOjQVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:PortKind" href="core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIOjQly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIPKUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIPKUVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIPKUly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Stereotype" href="core.uml#_Wtq4sFDlEd6cwecVIgl9nw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_09vZcbnYEeCxXoyQxQ47PQ" x="54" y="28" width="127" height="37"/> </children> @@ -1405,6 +1560,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_0-FXsrnYEeCxXoyQxQ47PQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-FXs7nYEeCxXoyQxQ47PQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIQ_gFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIQ_gVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:PortKind" href="core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIQ_gly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIQ_g1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIQ_hFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIQ_hVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Stereotype" href="core.uml#_Wtq4sVDlEd6cwecVIgl9nw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-EJkbnYEeCxXoyQxQ47PQ" x="54" y="351" width="127" height="37"/> </children> @@ -1441,6 +1605,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_0-YSrrnYEeCxXoyQxQ47PQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-YSr7nYEeCxXoyQxQ47PQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIS0sFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIS0sVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:PortKind" href="core.uml#_pE6GUFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIS0sly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kITbwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kITbwVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kITbwly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Stereotype" href="core.uml#_Wtq4slDlEd6cwecVIgl9nw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-XrkbnYEeCxXoyQxQ47PQ" x="54" y="297" width="127" height="37"/> </children> @@ -1477,6 +1650,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_0-sbv7nYEeCxXoyQxQ47PQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-sbwLnYEeCxXoyQxQ47PQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIVQ8Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIVQ8Vy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:PortKind" href="core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIVQ8ly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIV4AFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIV4AVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIV4Aly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Stereotype" href="core.uml#_WtrfwlDlEd6cwecVIgl9nw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-rNkbnYEeCxXoyQxQ47PQ" x="54" y="243" width="127" height="37"/> </children> @@ -1513,6 +1695,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_0--Ij7nYEeCxXoyQxQ47PQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0--IkLnYEeCxXoyQxQ47PQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIXGIFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIXGIVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:PortKind" href="core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIXGIly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIXtMFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIXtMVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIXtMly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Stereotype" href="core.uml#_Wtrfw1DlEd6cwecVIgl9nw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-9hcbnYEeCxXoyQxQ47PQ" x="54" y="81" width="127" height="37"/> </children> @@ -1549,6 +1740,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_0_P1VrnYEeCxXoyQxQ47PQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_P1V7nYEeCxXoyQxQ47PQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIZiYFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIZiYVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:PortKind" href="core.uml#_KtgR0LqOEd-SedGzMDDkww"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIZiYly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIaJcFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIaJcVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIaJcly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Stereotype" href="core.uml#__nMrwLqNEd-SedGzMDDkww"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_OnMbnYEeCxXoyQxQ47PQ" x="54" y="135" width="127" height="37"/> </children> @@ -1585,6 +1785,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_0_lzlrnYEeCxXoyQxQ47PQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_lzl7nYEeCxXoyQxQ47PQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIb-oFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIb-oVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:PortKind" href="core.uml#_H5-aQLqOEd-SedGzMDDkww"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIb-oly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIb-o1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIb-pFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIb-pVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Stereotype" href="core.uml#_AQZZwLqOEd-SedGzMDDkww"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_j-YbnYEeCxXoyQxQ47PQ" x="54" y="189" width="127" height="37"/> </children> @@ -1736,6 +1945,15 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_GkOCbS8qEeKx7OxAiA06uw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkOCbi8qEeKx7OxAiA06uw"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIfpAFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIfpAVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:PortKind" href="core.uml#_SrCqQC8qEeKx7OxAiA06uw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIfpAly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kIfpA1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kIfpBFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIfpBVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Stereotype" href="core.uml#_GjnlcC8qEeKx7OxAiA06uw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkK_EC8qEeKx7OxAiA06uw" x="54" y="405" width="127" height="37"/> </children> @@ -1913,12 +2131,30 @@ <element xmi:type="uml:Port" href="core.uml#__SLXgNtxEd6nqsBVkgJEEA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y3o_QPTWEeCn1-FCrfecFg" x="-10" y="7"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kKoXAFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kKoXAVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InterceptionRule" href="core.uml#_qlcF8AJzEeG0Lb1KYG16fA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKoXAly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kKoXA1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kKoXBFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKoXBVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#_mvN04PTWEeCn1-FCrfecFg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxqE4fTWEeCn1-FCrfecFg" x="31" y="31" width="199" height="37"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_V4BOxPEnEeCIafpoJVk7CQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4BOxfEnEeCIafpoJVk7CQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kKmh0Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kKmh0Vy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:ContainerRule" href="core.uml#_3Jq5MARLEd-OidZzGKCpzg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKmh0ly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kKnI4Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kKnI4Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKnI4ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_14WtMARJEd--t-uhRn9OBA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3-LcfEnEeCIafpoJVk7CQ" x="72" y="36" width="262" height="145"/> </children> @@ -1974,12 +2210,25 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_JWCtqCjaEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JWCtqSjaEeGFbebITJYb9g"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kKsocFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kKsocVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKsocly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#_6yVMkCjZEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JWCGkSjaEeGFbebITJYb9g" x="10" y="10" width="156"/> </children> <styles xmi:type="notation:TitleStyle" xmi:id="_HDA7GCjaEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HDA7GSjaEeGFbebITJYb9g"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kKqzQFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kKqzQVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:ContainerRule" href="core.uml#_MS45QCjaEeGFbebITJYb9g"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKqzQly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kKraUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kKraUVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKraUly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_1sCBICjZEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HDAUASjaEeGFbebITJYb9g" x="72" y="252" width="261" height="101"/> </children> @@ -2046,6 +2295,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_k-Rs8fN8EeCovO8AYZymZQ" showTitle="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k-Rs8vN8EeCovO8AYZymZQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kn7-EFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kn7-EVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn7-Ely8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#_k-OpoPN8EeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k-Qe0fN8EeCovO8AYZymZQ" x="24" y="41" width="165" height="23"/> </children> @@ -2068,6 +2321,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="__a4EJ_QXEeCovO8AYZymZQ" showTitle="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__a4EKPQXEeCovO8AYZymZQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kn8lIFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kn8lIVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn8lIly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#__a1A0PQXEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__a22AfQXEeCovO8AYZymZQ" x="24" y="5" width="165" height="23"/> </children> @@ -2090,6 +2347,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_KnUudvQYEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnUud_QYEeCovO8AYZymZQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kn9zQFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kn9zQVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn9zQly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#_KnS5QPQYEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnUHYfQYEeCovO8AYZymZQ" x="24" y="83" width="165" height="23"/> </children> @@ -2125,6 +2386,15 @@ <element xmi:type="uml:Port" href="core.uml#_MzO8gPNAEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M0b2YfNAEeCovO8AYZymZQ" x="-10" y="60" width="20" height="20"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kn6I4Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kn6I4Vy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="C_Cpp:Include" href="core.uml#_Yx49gCaeEeG4fZdVXNtoOQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn6I4ly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kn6I41y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kn6I5Fy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn6I5Vy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_JRmo0PNAEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JRsvcfNAEeCovO8AYZymZQ" x="171" y="32" width="212" height="159"/> </children> @@ -2208,6 +2478,10 @@ <element xmi:type="uml:Port" href="core.uml#__SLXgNtxEd6nqsBVkgJEEA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f8HYESjZEeGFbebITJYb9g" x="-10" y="45"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kn_BYFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kn_BYVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn_BYly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_9V8OQCjYEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9dH0USjYEeGFbebITJYb9g" x="171" y="302" width="217" height="92"/> </children> @@ -2226,6 +2500,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_WoROKCjZEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WoROKSjZEeGFbebITJYb9g"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_koA2kFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_koA2kVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koA2kly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_-WNegNtxEd6nqsBVkgJEEA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WoQnESjZEeGFbebITJYb9g" x="171" y="250" width="217" height="26"/> </children> @@ -2333,6 +2611,10 @@ <element xmi:type="uml:Port" href="core.uml#_ATRiECjZEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ksloSkAEeGDDbdzqSb4UA" x="153" y="16"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_koCrwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_koCrwVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koCrwly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#_ARs_UCjaEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qz8yvikAEeGDDbdzqSb4UA" x="22" y="103" width="163" height="51"/> </children> @@ -2384,6 +2666,10 @@ <element xmi:type="uml:Port" href="core.uml#_ZjdOAP-EEd6628OhKk_dpg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qz8y1ykAEeGDDbdzqSb4UA" x="63" y="42"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_koEg8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_koEg8Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koEg8ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#_RMqEkCjaEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qz8y2CkAEeGDDbdzqSb4UA" x="22" y="7" width="163" height="52"/> </children> @@ -2419,6 +2705,10 @@ <element xmi:type="uml:Port" href="core.uml#_3NSGwCkAEeGDDbdzqSb4UA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3PyBISkAEeGDDbdzqSb4UA" x="288" y="144" width="20" height="20"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_koCEsFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_koCEsVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koCEsly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_-X6zMCjZEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qz8y2ykAEeGDDbdzqSb4UA" x="455" y="39" width="298" height="199"/> </children> @@ -2543,6 +2833,10 @@ <element xmi:type="uml:Port" href="core.uml#_MhH6cENxEeGoAtSeIK7WLg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVa2wUN9EeGfhclnRyNzoA" x="-10" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kfWp0Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kfWp0Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfWp0ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_b_yh4AzyEd6it_RkGhz_AA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVJ-IfNGEeCovO8AYZymZQ" x="90" y="279" width="127" height="73"/> </children> @@ -2590,6 +2884,10 @@ <element xmi:type="uml:Port" href="core.uml#_P4xVsNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qJrqYfNGEeCovO8AYZymZQ" x="-10" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kfYfAFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kfYfAVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfYfAly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_j29X4NttEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kENg8fNGEeCovO8AYZymZQ" x="90" y="36" width="316" height="73"/> </children> @@ -2666,6 +2964,10 @@ <element xmi:type="uml:Port" href="core.uml#_Zd558ENxEeGoAtSeIK7WLg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cQDbAUN9EeGfhclnRyNzoA" x="117" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kfZtIFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kfZtIVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfZtIly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_fmF6MAzyEd6it_RkGhz_AA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqiqAfNGEeCovO8AYZymZQ" x="396" y="279" width="127" height="73"/> </children> @@ -2713,6 +3015,10 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qpQiUfNGEeCovO8AYZymZQ" x="117" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kfbiUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kfbiUVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfbiUly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_mIpj8Ns8Ed2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1VGkfNGEeCovO8AYZymZQ" x="468" y="36" width="127" height="73"/> </children> @@ -2789,6 +3095,15 @@ <element xmi:type="uml:Port" href="core.uml#_MhH6cENxEeGoAtSeIK7WLg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vzOfsUN9EeGfhclnRyNzoA" x="-10" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kfcwcFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kfcwcVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:ImplementationProperties" href="core.uml#_WIe68PQMEeCovO8AYZymZQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfcwcly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kfcwc1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kfcwdFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfcwdVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#__uJRYPNGEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="__uLGkfNGEeCovO8AYZymZQ" x="90" y="405" width="127" height="73"/> </children> @@ -2862,6 +3177,10 @@ <element xmi:type="uml:Port" href="core.uml#_-nk_cENqEeGoAtSeIK7WLg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-nzo8UNqEeGoAtSeIK7WLg" x="117" y="36" width="20" height="20"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kffzwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kffzwVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kffzwly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_u7MmIENqEeGoAtSeIK7WLg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u_QmwUNqEeGoAtSeIK7WLg" x="90" y="144" width="127" height="73"/> </children> @@ -2938,6 +3257,10 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zePOUUN8EeGfhclnRyNzoA" x="117" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kfho8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kfho8Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfho8ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_1xGG8ENqEeGoAtSeIK7WLg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1xcsQUNqEeGoAtSeIK7WLg" x="468" y="144" width="127" height="73"/> </children> @@ -3011,6 +3334,10 @@ <element xmi:type="uml:Port" href="core.uml#_i5SOQEN8EeGfhclnRyNzoA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i75dYEN8EeGfhclnRyNzoA" x="117" y="36" width="20" height="20"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kfi3EFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kfi3EVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfi3Ely8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_H7IOcENrEeGoAtSeIK7WLg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H7kTUUNrEeGoAtSeIK7WLg" x="279" y="144" width="127" height="73"/> </children> @@ -3100,6 +3427,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_jQmKVPNUEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQmKVfNUEeCovO8AYZymZQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kcbRoFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kcbRoVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kcbRoly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Enumeration" href="core.uml#_jQjHAPNUEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQk8MfNUEeCovO8AYZymZQ" x="387" y="83"/> </children> @@ -3160,6 +3491,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_SPSrLVjnEeKaM_PspnG53g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SPSrLljnEeKaM_PspnG53g"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kccfwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kccfwVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kccfwly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_WkkjoPNUEeCovO8AYZymZQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SPPn0VjnEeKaM_PspnG53g" x="130" y="78"/> </children> @@ -3198,6 +3533,15 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_j5_skSnOEeGxrprK9wB9iA" showTitle="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j5_skinOEeGxrprK9wB9iA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNDY4Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNDY4Vy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:ConfigurationProperty" href="core.uml#_s0fGMMGJEd-Mveea1W_olA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNDY4ly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNDY41y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNDY5Fy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNDY5Vy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#_rVfYoMGJEd-Mveea1W_olA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j5-ecSnOEeGxrprK9wB9iA" x="10" y="10" width="131"/> </children> @@ -3218,6 +3562,20 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_hvuNYSnOEeGxrprK9wB9iA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hvuNYinOEeGxrprK9wB9iA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNBjsFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNBjsVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="C_Cpp:Include" href="core.uml#_Q7TVYBJcEd-QgZm_R1AKbA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNBjsly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNBjs1y8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNBjtFy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="SW_Concurrency:SwSchedulableResource" href="core.uml#_42YPYBn3EeONpa5JgejICQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNBjtVy8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNBjtly8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNBjt1y8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNBjuFy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_SiY_AP-EEd6628OhKk_dpg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hvsYMSnOEeGxrprK9wB9iA" x="62" y="64" width="524" height="135"/> </children> @@ -3252,6 +3610,15 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_vBNRlSnOEeGxrprK9wB9iA" showTitle="true"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vBNRlinOEeGxrprK9wB9iA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNF1IFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNF1IVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:ConfigurationProperty" href="core.uml#_zVumMCjbEeGFbebITJYb9g"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNF1Ily8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNF1I1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNF1JFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNF1JVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Property" href="core.uml#_tmNeoCjbEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vBLcYSnOEeGxrprK9wB9iA" x="10" y="10" width="173"/> </children> @@ -3272,6 +3639,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_t6xN9CnOEeGxrprK9wB9iA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t6xN9SnOEeGxrprK9wB9iA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNEnAFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNEnAVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNEnAly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_9V8OQCjYEeGFbebITJYb9g"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t6v_0SnOEeGxrprK9wB9iA" x="65" y="245" width="521" height="161"/> </children> @@ -3290,6 +3661,15 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_RAN52Co0EeGxrprK9wB9iA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RAN52So0EeGxrprK9wB9iA"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNHqUFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNHqUVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="C_Cpp:Include" href="pathmap://QML_CORE/osal.uml#_tNGmwDkUEdyuzNpSiGPe4w"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNHqUly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kNHqU1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kNHqVFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNHqVVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_ETakYDj8Edy0Rd6V_tf1-Q"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RANSwSo0EeGxrprK9wB9iA" x="652" y="261" width="60" height="55"/> </children> @@ -3396,6 +3776,10 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dcSwxD8AEeGJ6KSvhYhYuQ" x="360" y="23"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kaQHYFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kaQHYVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaQHYly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_e6Y_EChYEd-eoo60eNyGlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SgFh4T8AEeGJ6KSvhYhYuQ" x="117" y="99" width="370"/> </children> @@ -3501,6 +3885,10 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1JWfIz8EEeGJ6KSvhYhYuQ" x="-10" y="27"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kaTKsFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kaTKsVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaTKsly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_qgzokChYEd-eoo60eNyGlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S-NoUT8AEeGJ6KSvhYhYuQ" x="117" y="189" width="109" height="73"/> </children> @@ -3519,6 +3907,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_TeXIBz8AEeGJ6KSvhYhYuQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TeXICD8AEeGJ6KSvhYhYuQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kaVm8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kaVm8Vy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaVm8ly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_2wMyEChiEd-eoo60eNyGlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TeWg8T8AEeGJ6KSvhYhYuQ" x="252" y="189"/> </children> @@ -3537,6 +3929,10 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_T7aQaD8AEeGJ6KSvhYhYuQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7aQaT8AEeGJ6KSvhYhYuQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kaW1EFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kaW1EVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaW1Ely8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_6rmQoChiEd-eoo60eNyGlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7ZpUT8AEeGJ6KSvhYhYuQ" x="387" y="189" width="95"/> </children> @@ -3555,6 +3951,15 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_gXBcgT8AEeGJ6KSvhYhYuQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gXBcgj8AEeGJ6KSvhYhYuQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kaXcIFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kaXcIVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_s8OWIFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaXcIly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kaYDMFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kaYDMVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaYDMly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_KxQBELuXEd2TTr3gJIvazw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gXAOYT8AEeGJ6KSvhYhYuQ" x="117" y="18" width="370"/> </children> @@ -3601,6 +4006,10 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_jQ_oaD8CEeGJ6KSvhYhYuQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQ_oaT8CEeGJ6KSvhYhYuQ"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_kaZRUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_kaZRUVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaZRUly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Enumeration" href="core.uml#_hcwDkD8CEeGJ6KSvhYhYuQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQ_BUT8CEeGJ6KSvhYhYuQ" x="441" y="261" width="164"/> </children> @@ -3664,6 +4073,15 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_EYwhaF7qEeGEmrrwB1vhPg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EYwhaV7qEeGEmrrwB1vhPg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_khqW8Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_khqW8Vy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_s8OWIFR1Ed6GqrP6fkWBoQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khqW8ly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_khqW81y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_khqW9Fy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khqW9Vy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_KxQBELuXEd2TTr3gJIvazw"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EYv6UV7qEeGEmrrwB1vhPg" x="135" y="72" width="154" height="64"/> </children> @@ -3747,6 +4165,15 @@ <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_udLTgV7sEeGEmrrwB1vhPg" x="144" y="36"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_khrlEFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_khrlEVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_efp4QClzEd-eoo60eNyGlg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khrlEly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_khrlE1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_khrlFFy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khrlFVy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_Whe8EClYEd-eoo60eNyGlg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FWtXYV7qEeGEmrrwB1vhPg" x="135" y="198" width="154" height="64"/> </children> @@ -3779,6 +4206,15 @@ <styles xmi:type="notation:TitleStyle" xmi:id="_b3pi2F7sEeGEmrrwB1vhPg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b3pi2V7sEeGEmrrwB1vhPg"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_khtaQFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_khtaQVy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_Z3Zs4F7tEeGEmrrwB1vhPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khtaQly8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_khuBUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_khuBUVy8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khuBUly8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_TLShkF7qEeGEmrrwB1vhPg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b3o7wV7sEeGEmrrwB1vhPg" x="423" y="71" width="154" height="65"/> </children> @@ -3870,6 +4306,15 @@ <element xmi:type="uml:Port" href="core.uml#_P4xVsNtuEd2eM5kqcby5ZA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qroUh17sEeGEmrrwB1vhPg" x="-10" y="38"/> </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_khuoYFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_khvPcFy8EeOwKfaVRwV11Q" showTitle="true"/> + <element xmi:type="FCM:InteractionComponent" href="core.uml#_UBcmIF7tEeGEmrrwB1vhPg"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khvPcVy8EeOwKfaVRwV11Q"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_khvPcly8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_khvPc1y8EeOwKfaVRwV11Q"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khvPdFy8EeOwKfaVRwV11Q"/> + </children> <element xmi:type="uml:Class" href="core.uml#_Mo2kwF7pEeGEmrrwB1vhPg"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck0K0V7sEeGEmrrwB1vhPg" x="420" y="196" width="157" height="66"/> </children> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml index a154e34bd5b..2fd3609ae47 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml @@ -1127,6 +1127,7 @@ for (;;) { </ownedBehavior> <ownedOperation xmi:type="uml:Operation" xmi:id="_F-cDMCjbEeGFbebITJYb9g" name="activate" method="_RMkvkCjbEeGFbebITJYb9g"/> <ownedOperation xmi:type="uml:Operation" xmi:id="_F-iJ0CjbEeGFbebITJYb9g" name="deactivate"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rljQcFy8EeOwKfaVRwV11Q" name="configuration_complete"/> </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_1sCBICjZEeGFbebITJYb9g" name="PeriodicTimerRule"> <ownedAttribute xmi:type="uml:Property" xmi:id="_6yVMkCjZEeGFbebITJYb9g" name="timer" visibility="public" type="_9V8OQCjYEeGFbebITJYb9g"> @@ -1534,4 +1535,7 @@ Be aware that the number of instantiated template packages will be considerably </FCM:DerivedElement> <C_Cpp:Ptr xmi:id="_TKlisCxyEeOMQpc6Y-MAJw" base_parameter="_TJjA4CxyEeOMQpc6Y-MAJw"/> <C_Cpp:Ptr xmi:id="_TTpYECxyEeOMQpc6Y-MAJw" base_parameter="_TKyXACxyEeOMQpc6Y-MAJw"/> + <FCM:DerivedElement xmi:id="_rlowAFy8EeOwKfaVRwV11Q" base_Element="_rljQcFy8EeOwKfaVRwV11Q"> + <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_ns4qsClUEeO4bs_nkcnKOg"/> + </FCM:DerivedElement> </xmi:XMI> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di index ee692079cdc..e82d971c797 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ASCII"?> +<?xml version="1.0" encoding="UTF-8"?> <di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_agpmUOUTEd-P08Bciq_LqQ"> <pageList xmi:id="_agpmUeUTEd-P08Bciq_LqQ"> <availablePage xmi:id="_deTDMOUTEd-P08Bciq_LqQ"> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation index b2188d93035..193e35d019e 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation @@ -120,7 +120,7 @@ <element xmi:type="uml:Class" href="statemachine.uml#_ens7QOUTEd-P08Bciq_LqQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_en03EeUTEd-P08Bciq_LqQ" x="54" y="135" width="235" height="163"/> </children> - <children xmi:type="notation:Shape" xmi:id="_u-vbIOUTEd-P08Bciq_LqQ" type="2073" fontName="" fontHeight="10" lineColor="0"> + <children xmi:type="notation:Shape" xmi:id="_u-vbIOUTEd-P08Bciq_LqQ" type="2073" fontName="" fontHeight="10" gradient="16777215, -1, 0" lineColor="0"> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_u-vbIuUTEd-P08Bciq_LqQ" source="ShadowFigure"> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_u-vbI-UTEd-P08Bciq_LqQ" key="ShadowFigure_Value" value="false"/> </eAnnotations> @@ -137,6 +137,9 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NOU4k83zEeGrI9HID9bwtg" key="PropStereoDisplay" value=""/> <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NOVfoM3zEeGrI9HID9bwtg" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__yjQ4GGAEeO2F4QRMDSOXg" source="PapyrusCSSForceValue"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__yj38GGAEeO2F4QRMDSOXg" key="gradient" value="true"/> + </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_u-wCM-UTEd-P08Bciq_LqQ" type="5156"/> <children xmi:type="notation:BasicCompartment" xmi:id="_u-wCNOUTEd-P08Bciq_LqQ" type="7073"> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-wCNeUTEd-P08Bciq_LqQ"/> @@ -1115,11 +1118,11 @@ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xEctlV81EeGbQoflzrdx0g" key="QualifiedNameDepth" value="1000"/> </eAnnotations> <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uqphYF_1EeGbQoflzrdx0g" source="Stereotype_Annotation"> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIcF_1EeGbQoflzrdx0g" key="StereotypeWithQualifiedNameList" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIcV_1EeGbQoflzrdx0g" key="StereotypeList" value="FCM::Singleton"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIcl_1EeGbQoflzrdx0g" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIc1_1EeGbQoflzrdx0g" key="PropStereoDisplay" value=""/> - <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIdF_1EeGbQoflzrdx0g" key="StereotypePropertyLocation" value="Compartment"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VomFMGGDEeO2F4QRMDSOXg" key="StereotypeWithQualifiedNameList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VomFMWGDEeO2F4QRMDSOXg" key="StereotypeList" value="FCM::Singleton"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VomFMmGDEeO2F4QRMDSOXg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VomFM2GDEeO2F4QRMDSOXg" key="PropStereoDisplay" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VomFNGGDEeO2F4QRMDSOXg" key="StereotypePropertyLocation" value="Compartment"/> </eAnnotations> <children xmi:type="notation:DecorationNode" xmi:id="_xEdUoF81EeGbQoflzrdx0g" type="5156"/> <children xmi:type="notation:BasicCompartment" xmi:id="_xEdUoV81EeGbQoflzrdx0g" type="7073"> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml index 6c392920949..05cc3939310 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml @@ -1,33 +1,33 @@ <?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:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML"> <uml:Model xmi:id="_ago_QOUTEd-P08Bciq_LqQ" name="statemachine"> - <ownedComment xmi:id="_9BpKIOuLEeCTfOY57pgE3w" annotatedElement="_u-qioOUTEd-P08Bciq_LqQ"> + <ownedComment xmi:type="uml:Comment" xmi:id="_9BpKIOuLEeCTfOY57pgE3w" annotatedElement="_u-qioOUTEd-P08Bciq_LqQ"> <body>Call event interceptor, interacts with state-machine. It will handle in particular call events that are intercepted by the port operations</body> </ownedComment> - <ownedComment xmi:id="_LuBKcDeoEeGPyrZ5I3hMlA" annotatedElement="_18qdsO67EeCZ9MjsZTV1zw"> + <ownedComment xmi:type="uml:Comment" xmi:id="_LuBKcDeoEeGPyrZ5I3hMlA" annotatedElement="_18qdsO67EeCZ9MjsZTV1zw"> <body>Container rule for state machine realization. It consists of a collaboration of a call event interceptor, an event pool, the state-machine itself and a thread for this state-machine. The latter means that the state-machine will execute in its own thread and poll the pool for new events.</body> </ownedComment> - <packageImport xmi:id="_e8dN0OUUEd-P08Bciq_LqQ"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_e8dN0OUUEd-P08Bciq_LqQ"> <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/> </packageImport> - <packageImport xmi:id="_76Rc8OuMEeCTfOY57pgE3w"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_76Rc8OuMEeCTfOY57pgE3w"> <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/> </packageImport> - <packageImport xmi:id="_guUMgOuNEeCTfOY57pgE3w"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_guUMgOuNEeCTfOY57pgE3w"> <importedPackage xmi:type="uml:Model" href="pathmap://Papyrus_Alf_LIBRARIES/alflibrary.uml#_0bBI4Hy5EeCKy5kSqd4eVw"/> </packageImport> - <packageImport xmi:id="_Ov3NkF82EeGbQoflzrdx0g"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_Ov3NkF82EeGbQoflzrdx0g"> <importedPackage xmi:type="uml:Model" href="pathmap://QML_DISTRIBUTION/distribution.uml#_O6TiIDLUEd26WNosUASSSw"/> </packageImport> <packagedElement xmi:type="uml:Package" xmi:id="_i9AuoOUTEd-P08Bciq_LqQ" name="SMInterceptor"> - <packageImport xmi:id="_q2WCYOUTEd-P08Bciq_LqQ"> - <importedPackage href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/> + <packageImport xmi:type="uml:PackageImport" xmi:id="_q2WCYOUTEd-P08Bciq_LqQ"> + <importedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/> </packageImport> - <packageMerge xmi:id="_ttDuoP3HEeC1YdT2qA0bjA"> - <mergedPackage href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/> + <packageMerge xmi:type="uml:PackageMerge" xmi:id="_ttDuoP3HEeC1YdT2qA0bjA"> + <mergedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/> </packageMerge> <packagedElement xmi:type="uml:Class" xmi:id="_u-qioOUTEd-P08Bciq_LqQ" clientDependency="_qJxa0OUUEd-P08Bciq_LqQ _d3GdYOUWEd-P08Bciq_LqQ" name="CI_CallEvent"> - <generalization xmi:id="_3LpLIOUTEd-P08Bciq_LqQ"> + <generalization xmi:type="uml:Generalization" xmi:id="_3LpLIOUTEd-P08Bciq_LqQ"> <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/> </generalization> <ownedAttribute xmi:type="uml:Port" xmi:id="_a4NKMOuMEeCTfOY57pgE3w" name="out" visibility="public" aggregation="composite"> @@ -38,14 +38,14 @@ <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_bL0sACVvEeGaL60JjVj19Q" name="portID"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_bL0sACVvEeGaL60JjVj19Q" name="portID"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bMjEwCVvEeGaL60JjVj19Q" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bMjr0CVvEeGaL60JjVj19Q" value="1"/> </ownedAttribute> - <interfaceRealization xmi:id="_qJxa0OUUEd-P08Bciq_LqQ" name="derived realization of I" client="_u-qioOUTEd-P08Bciq_LqQ"> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_qJxa0OUUEd-P08Bciq_LqQ" name="derived realization of I" client="_u-qioOUTEd-P08Bciq_LqQ"> <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/> - <contract href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/> + <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/> </interfaceRealization> <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_mlIZ8OUVEd-P08Bciq_LqQ" name="<%name%>" specification="_2qJyMOUUEd-P08Bciq_LqQ"> <language>C/C++</language> @@ -61,21 +61,21 @@ out->writeEvent (event); [if not (type = null)]return [/if]rconn->[operation.cppCall()/]; [/template]</body> </ownedBehavior> - <ownedOperation xmi:id="_2qJyMOUUEd-P08Bciq_LqQ" name="[name/]" method="_mlIZ8OUVEd-P08Bciq_LqQ"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_2qJyMOUUEd-P08Bciq_LqQ" name="[name/]" method="_mlIZ8OUVEd-P08Bciq_LqQ"/> </packagedElement> <packagedElement xmi:type="uml:Dependency" xmi:id="_d3GdYOUWEd-P08Bciq_LqQ" name="Dependency0" client="_u-qioOUTEd-P08Bciq_LqQ"> <supplier xmi:type="uml:Enumeration" href="pathmap://QML_CORE/core.uml#_2oxDIPiPEd2UhpY2Y3WUyg"/> </packagedElement> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_9J39cOupEeCTfOY57pgE3w" name="StateMachine"> - <packageMerge xmi:id="_lvUcAP3HEeC1YdT2qA0bjA"> - <mergedPackage href="pathmap://QML_CORE/core.uml#_m7SIwOUYEd-P08Bciq_LqQ"/> + <packageMerge xmi:type="uml:PackageMerge" xmi:id="_lvUcAP3HEeC1YdT2qA0bjA"> + <mergedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_m7SIwOUYEd-P08Bciq_LqQ"/> </packageMerge> <packagedElement xmi:type="uml:Class" xmi:id="_ens7QOUTEd-P08Bciq_LqQ" clientDependency="_Q2C7UBE0EeG3cfLoiI6G7g _RqmkwBE0EeG3cfLoiI6G7g _F3inwCT7EeGXBt65HZzY7g _3GXWYCWSEeGB3KV6qwTHBw" name="StateMachine"> - <generalization xmi:id="_ar4sECWNEeGB3KV6qwTHBw"> + <generalization xmi:type="uml:Generalization" xmi:id="_ar4sECWNEeGB3KV6qwTHBw"> <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/> </generalization> - <ownedAttribute xmi:id="_dFBg4OupEeCTfOY57pgE3w" name="m_currentState" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_dFBg4OupEeCTfOY57pgE3w" name="m_currentState" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dFurgOupEeCTfOY57pgE3w" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dFurgeupEeCTfOY57pgE3w" value="1"/> @@ -83,7 +83,7 @@ out->writeEvent (event); <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_S9FLsO3GEeCHv5BGhoZ8CA" name="executor" aggregation="shared" association="_S99VcO3GEeCHv5BGhoZ8CA"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_S9FLsO3GEeCHv5BGhoZ8CA" name="executor" aggregation="shared" association="_S99VcO3GEeCHv5BGhoZ8CA"> <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_6uRBMOuqEeCTfOY57pgE3w"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S9FLsu3GEeCHv5BGhoZ8CA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S9FLse3GEeCHv5BGhoZ8CA" value="1"/> @@ -103,9 +103,9 @@ out->writeEvent (event); <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <interfaceRealization xmi:id="_3GXWYCWSEeGB3KV6qwTHBw" name="derived realization of ILifeCycle" client="_ens7QOUTEd-P08Bciq_LqQ"> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_3GXWYCWSEeGB3KV6qwTHBw" name="derived realization of ILifeCycle" client="_ens7QOUTEd-P08Bciq_LqQ"> <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> + <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> </interfaceRealization> <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_rglykOupEeCTfOY57pgE3w" name="processEvents" visibility="package" specification="_b5mYgCaiEeGRo-gX9igNzw"> <language>C/C++</language> @@ -122,12 +122,12 @@ out->writeEvent (event); processEvents(); }</body> </ownedBehavior> - <ownedOperation xmi:id="_3GbAwCWSEeGB3KV6qwTHBw" name="activate" method="_p_0sUCaiEeGRo-gX9igNzw"/> - <ownedOperation xmi:id="_3G6I8CWSEeGB3KV6qwTHBw" name="deactivate"/> - <ownedOperation xmi:id="_b5mYgCaiEeGRo-gX9igNzw" name="processEvents" method="_rglykOupEeCTfOY57pgE3w"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_3GbAwCWSEeGB3KV6qwTHBw" name="activate" method="_p_0sUCaiEeGRo-gX9igNzw"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_3G6I8CWSEeGB3KV6qwTHBw" name="deactivate"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_b5mYgCaiEeGRo-gX9igNzw" name="processEvents" method="_rglykOupEeCTfOY57pgE3w"/> </packagedElement> <packagedElement xmi:type="uml:Association" xmi:id="_S99VcO3GEeCHv5BGhoZ8CA" name="stateMachine_executor" memberEnd="_S99Vce3GEeCHv5BGhoZ8CA _S9FLsO3GEeCHv5BGhoZ8CA"> - <ownedEnd xmi:id="_S99Vce3GEeCHv5BGhoZ8CA" name="stateMachine" type="_ens7QOUTEd-P08Bciq_LqQ" association="_S99VcO3GEeCHv5BGhoZ8CA"> + <ownedEnd xmi:type="uml:Property" xmi:id="_S99Vce3GEeCHv5BGhoZ8CA" name="stateMachine" type="_ens7QOUTEd-P08Bciq_LqQ" association="_S99VcO3GEeCHv5BGhoZ8CA"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S998ge3GEeCHv5BGhoZ8CA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S998gO3GEeCHv5BGhoZ8CA" value="1"/> </ownedEnd> @@ -153,26 +153,26 @@ out->writeEvent (event); <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <interfaceRealization xmi:id="_bmInQF_4EeGbQoflzrdx0g" name="derived realization of IAnimation" client="_xELAwF81EeGbQoflzrdx0g" supplier="_L-I7kF8wEeGerN33d-RdRg" contract="_L-I7kF8wEeGerN33d-RdRg"/> - <ownedOperation xmi:id="_bmbiMF_4EeGbQoflzrdx0g" name="enterState"> - <ownedParameter xmi:id="_OJXykGEpEeGzd_21sXyuog" name="stateEnum"> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_bmInQF_4EeGbQoflzrdx0g" name="derived realization of IAnimation" client="_xELAwF81EeGbQoflzrdx0g" supplier="_L-I7kF8wEeGerN33d-RdRg" contract="_L-I7kF8wEeGerN33d-RdRg"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_bmbiMF_4EeGbQoflzrdx0g" name="enterState"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_OJXykGEpEeGzd_21sXyuog" name="stateEnum"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OJZAsGEpEeGzd_21sXyuog" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OJZAsWEpEeGzd_21sXyuog" value="1"/> </ownedParameter> - <ownedParameter xmi:id="_OJZnwGEpEeGzd_21sXyuog" name="eInstance"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_OJZnwGEpEeGzd_21sXyuog" name="eInstance"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OJa14GEpEeGzd_21sXyuog" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OJbc8GEpEeGzd_21sXyuog" value="1"/> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_bmo9kF_4EeGbQoflzrdx0g" name="leaveState"> - <ownedParameter xmi:id="_OKJOoGEpEeGzd_21sXyuog" name="eState"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_bmo9kF_4EeGbQoflzrdx0g" name="leaveState"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_OKJOoGEpEeGzd_21sXyuog" name="eState"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OKKcwGEpEeGzd_21sXyuog" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OKLD0GEpEeGzd_21sXyuog" value="1"/> </ownedParameter> - <ownedParameter xmi:id="_OKLD0WEpEeGzd_21sXyuog" name="eInstance"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_OKLD0WEpEeGzd_21sXyuog" name="eInstance"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OKMR8GEpEeGzd_21sXyuog" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OKM5AGEpEeGzd_21sXyuog"/> @@ -180,48 +180,49 @@ out->writeEvent (event); </ownedOperation> </packagedElement> <packagedElement xmi:type="uml:Interface" xmi:id="_L-I7kF8wEeGerN33d-RdRg" name="IAnimation"> - <ownedOperation xmi:id="_N3m-oF8wEeGerN33d-RdRg" name="enterState" visibility="public" isAbstract="true"> - <ownedComment xmi:id="_YmEFYV8wEeGerN33d-RdRg"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_N3m-oF8wEeGerN33d-RdRg" name="enterState" visibility="public" isAbstract="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_YmEFYV8wEeGerN33d-RdRg"> <body><<TextualRepresentation>>public abstract enterState (in stateEnum : StateMachine::Short, in eInstance : String) ;</body> </ownedComment> - <ownedParameter xmi:id="_NbPhQGEpEeGzd_21sXyuog" name="stateEnum"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_NbPhQGEpEeGzd_21sXyuog" name="stateEnum"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NbYEIGEpEeGzd_21sXyuog" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NbbHcGEpEeGzd_21sXyuog" value="1"/> </ownedParameter> - <ownedParameter xmi:id="_NbdjsGEpEeGzd_21sXyuog" name="eInstance"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_NbdjsGEpEeGzd_21sXyuog" name="eInstance"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NbupcGEpEeGzd_21sXyuog" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nb2lQGEpEeGzd_21sXyuog" value="1"/> </ownedParameter> </ownedOperation> - <ownedOperation xmi:id="_ZgY_oF8wEeGerN33d-RdRg" name="leaveState" visibility="public" isAbstract="true"> - <ownedComment xmi:id="_df_owF8wEeGerN33d-RdRg"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_ZgY_oF8wEeGerN33d-RdRg" name="leaveState" visibility="public" isAbstract="true"> + <ownedComment xmi:type="uml:Comment" xmi:id="_df_owF8wEeGerN33d-RdRg"> <body><<TextualRepresentation>>public abstract leaveState(in eState : StateMachine::Short, in eInstance : String) ;</body> </ownedComment> - <ownedParameter xmi:id="_OJfHUGEpEeGzd_21sXyuog" name="eState"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_OJfHUGEpEeGzd_21sXyuog" name="eState"> <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OJr7oGEpEeGzd_21sXyuog" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OJwNEGEpEeGzd_21sXyuog" value="1"/> </ownedParameter> - <ownedParameter xmi:id="_OJ0egGEpEeGzd_21sXyuog" name="eInstance"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_OJ0egGEpEeGzd_21sXyuog" name="eInstance"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OKCg8GEpEeGzd_21sXyuog" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OKHZcGEpEeGzd_21sXyuog" value="1"/> </ownedParameter> </ownedOperation> </packagedElement> + <packagedElement xmi:type="uml:Class" xmi:id="_QH7R8GGDEeO2F4QRMDSOXg" name="AnimServiceConfigurator"/> </packagedElement> <packagedElement xmi:type="uml:Package" xmi:id="_DEJCwF81EeGbQoflzrdx0g" name="rules"> <packagedElement xmi:type="uml:Class" xmi:id="_18qdsO67EeCZ9MjsZTV1zw" name="StateMachineWCallEvents"> - <ownedAttribute xmi:id="_LyxAEPTXEeCn1-FCrfecFg" name="callEventInterceptor" visibility="public" type="_u-qioOUTEd-P08Bciq_LqQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_LyxAEPTXEeCn1-FCrfecFg" name="callEventInterceptor" visibility="public" type="_u-qioOUTEd-P08Bciq_LqQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MGWDYPTXEeCn1-FCrfecFg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MGfNUPTXEeCn1-FCrfecFg" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_MGz9cPTXEeCn1-FCrfecFg"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_jXX54PTXEeCn1-FCrfecFg" name="eventPool" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_jXX54PTXEeCn1-FCrfecFg" name="eventPool" visibility="public"> <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_JRmo0PNAEeCovO8AYZymZQ"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l6kPYPTXEeCn1-FCrfecFg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l6k2cPTXEeCn1-FCrfecFg" value="1"/> @@ -229,14 +230,14 @@ out->writeEvent (event); <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_mv6jAPTXEeCn1-FCrfecFg" name="stateMachine" visibility="public" type="_ens7QOUTEd-P08Bciq_LqQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_mv6jAPTXEeCn1-FCrfecFg" name="stateMachine" visibility="public" type="_ens7QOUTEd-P08Bciq_LqQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ocG_EPTXEeCn1-FCrfecFg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ocHmIPTXEeCn1-FCrfecFg" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_ocI0QPTXEeCn1-FCrfecFg"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_vcPiUCWdEeGX6PuSE-DJlQ" name="thread" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_vcPiUCWdEeGX6PuSE-DJlQ" name="thread" visibility="public"> <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yS4YQCWdEeGX6PuSE-DJlQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yS4_UCWdEeGX6PuSE-DJlQ" value="1"/> @@ -244,35 +245,35 @@ out->writeEvent (event); <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedConnector xmi:id="_-DJY8PTXEeCn1-FCrfecFg" name="Connector-SM-Pool"> - <end xmi:id="_-DKnEPTXEeCn1-FCrfecFg" partWithPort="_mv6jAPTXEeCn1-FCrfecFg" role="_u7pk4PRUEeCKVJwdD4MMsg"> + <ownedConnector xmi:type="uml:Connector" xmi:id="_-DJY8PTXEeCn1-FCrfecFg" name="Connector-SM-Pool"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_-DKnEPTXEeCn1-FCrfecFg" partWithPort="_mv6jAPTXEeCn1-FCrfecFg" role="_u7pk4PRUEeCKVJwdD4MMsg"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-DKnEvTXEeCn1-FCrfecFg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-DKnEfTXEeCn1-FCrfecFg" value="1"/> </end> - <end xmi:id="_-DL1MPTXEeCn1-FCrfecFg" partWithPort="_jXX54PTXEeCn1-FCrfecFg"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_-DL1MPTXEeCn1-FCrfecFg" partWithPort="_jXX54PTXEeCn1-FCrfecFg"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-DL1MvTXEeCn1-FCrfecFg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-DL1MfTXEeCn1-FCrfecFg" value="1"/> <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/> </end> </ownedConnector> - <ownedConnector xmi:id="_nILRMPUHEeCn1-FCrfecFg" name="connector-CallEvent-Pool"> - <end xmi:id="_nIL4QPUHEeCn1-FCrfecFg" partWithPort="_LyxAEPTXEeCn1-FCrfecFg" role="_a4NKMOuMEeCTfOY57pgE3w"> + <ownedConnector xmi:type="uml:Connector" xmi:id="_nILRMPUHEeCn1-FCrfecFg" name="connector-CallEvent-Pool"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_nIL4QPUHEeCn1-FCrfecFg" partWithPort="_LyxAEPTXEeCn1-FCrfecFg" role="_a4NKMOuMEeCTfOY57pgE3w"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nIL4QvUHEeCn1-FCrfecFg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nIL4QfUHEeCn1-FCrfecFg" value="1"/> </end> - <end xmi:id="_nIMfUPUHEeCn1-FCrfecFg" partWithPort="_jXX54PTXEeCn1-FCrfecFg"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_nIMfUPUHEeCn1-FCrfecFg" partWithPort="_jXX54PTXEeCn1-FCrfecFg"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nIMfUvUHEeCn1-FCrfecFg" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nIMfUfUHEeCn1-FCrfecFg" value="1"/> <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/> </end> </ownedConnector> - <ownedConnector xmi:id="__zI4QCWdEeGX6PuSE-DJlQ" name="connector-SM-thread"> - <end xmi:id="__zI4QSWdEeGX6PuSE-DJlQ" partWithPort="_mv6jAPTXEeCn1-FCrfecFg"> + <ownedConnector xmi:type="uml:Connector" xmi:id="__zI4QCWdEeGX6PuSE-DJlQ" name="connector-SM-thread"> + <end xmi:type="uml:ConnectorEnd" xmi:id="__zI4QSWdEeGX6PuSE-DJlQ" partWithPort="_mv6jAPTXEeCn1-FCrfecFg"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__zI4QyWdEeGX6PuSE-DJlQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__zI4QiWdEeGX6PuSE-DJlQ" value="1"/> <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/> </end> - <end xmi:id="__zJfUCWdEeGX6PuSE-DJlQ" partWithPort="_vcPiUCWdEeGX6PuSE-DJlQ"> + <end xmi:type="uml:ConnectorEnd" xmi:id="__zJfUCWdEeGX6PuSE-DJlQ" partWithPort="_vcPiUCWdEeGX6PuSE-DJlQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__zJfUiWdEeGX6PuSE-DJlQ" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__zJfUSWdEeGX6PuSE-DJlQ" value="1"/> <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/> @@ -281,14 +282,14 @@ out->writeEvent (event); </packagedElement> <packagedElement xmi:type="uml:Class" xmi:id="_b1zNUOusEeCTfOY57pgE3w" name="StateMachine"/> <packagedElement xmi:type="uml:Class" xmi:id="_IeWosF81EeGbQoflzrdx0g" name="StateMachineWCallEventsAndAnim"> - <ownedAttribute xmi:id="_IeWosV81EeGbQoflzrdx0g" name="callEventInterceptor" visibility="public" type="_u-qioOUTEd-P08Bciq_LqQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_IeWosV81EeGbQoflzrdx0g" name="callEventInterceptor" visibility="public" type="_u-qioOUTEd-P08Bciq_LqQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeWos181EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeWosl81EeGbQoflzrdx0g" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_IeWotF81EeGbQoflzrdx0g"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_IeWotV81EeGbQoflzrdx0g" name="eventPool" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_IeWotV81EeGbQoflzrdx0g" name="eventPool" visibility="public"> <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_JRmo0PNAEeCovO8AYZymZQ"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeWot181EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeWotl81EeGbQoflzrdx0g" value="1"/> @@ -296,14 +297,14 @@ out->writeEvent (event); <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_IeXPwV81EeGbQoflzrdx0g" name="stateMachine" visibility="public" type="_ens7QOUTEd-P08Bciq_LqQ"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_IeXPwV81EeGbQoflzrdx0g" name="stateMachine" visibility="public" type="_ens7QOUTEd-P08Bciq_LqQ"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXPw181EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXPwl81EeGbQoflzrdx0g" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_IeXPxF81EeGbQoflzrdx0g"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_IeXPxV81EeGbQoflzrdx0g" name="thread" visibility="public"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_IeXPxV81EeGbQoflzrdx0g" name="thread" visibility="public"> <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXPx181EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXPxl81EeGbQoflzrdx0g" value="1"/> @@ -311,81 +312,81 @@ out->writeEvent (event); <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:id="_pTD04F81EeGbQoflzrdx0g" name="eclipseServer" visibility="public" type="_xELAwF81EeGbQoflzrdx0g" aggregation="shared"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_pTD04F81EeGbQoflzrdx0g" name="eclipseServer" visibility="public" type="_xELAwF81EeGbQoflzrdx0g" aggregation="shared"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rhbJ4F81EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rhpMUF81EeGbQoflzrdx0g" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_rhtdwF81EeGbQoflzrdx0g"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedConnector xmi:id="_IeXPyV81EeGbQoflzrdx0g" name="Connector-SM-Pool"> - <end xmi:id="_IeXPyl81EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g" role="_u7pk4PRUEeCKVJwdD4MMsg"> + <ownedConnector xmi:type="uml:Connector" xmi:id="_IeXPyV81EeGbQoflzrdx0g" name="Connector-SM-Pool"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXPyl81EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g" role="_u7pk4PRUEeCKVJwdD4MMsg"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXPzF81EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXPy181EeGbQoflzrdx0g" value="1"/> </end> - <end xmi:id="_IeXPzV81EeGbQoflzrdx0g" partWithPort="_IeWotV81EeGbQoflzrdx0g"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXPzV81EeGbQoflzrdx0g" partWithPort="_IeWotV81EeGbQoflzrdx0g"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXPz181EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXPzl81EeGbQoflzrdx0g" value="1"/> <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/> </end> </ownedConnector> - <ownedConnector xmi:id="_IeXP0F81EeGbQoflzrdx0g" name="connector-CallEvent-Pool"> - <end xmi:id="_IeXP0V81EeGbQoflzrdx0g" partWithPort="_IeWosV81EeGbQoflzrdx0g" role="_a4NKMOuMEeCTfOY57pgE3w"> + <ownedConnector xmi:type="uml:Connector" xmi:id="_IeXP0F81EeGbQoflzrdx0g" name="connector-CallEvent-Pool"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXP0V81EeGbQoflzrdx0g" partWithPort="_IeWosV81EeGbQoflzrdx0g" role="_a4NKMOuMEeCTfOY57pgE3w"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXP0181EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXP0l81EeGbQoflzrdx0g" value="1"/> </end> - <end xmi:id="_IeXP1F81EeGbQoflzrdx0g" partWithPort="_IeWotV81EeGbQoflzrdx0g"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXP1F81EeGbQoflzrdx0g" partWithPort="_IeWotV81EeGbQoflzrdx0g"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXP1l81EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXP1V81EeGbQoflzrdx0g" value="1"/> <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/> </end> </ownedConnector> - <ownedConnector xmi:id="_IeXP1181EeGbQoflzrdx0g" name="connector-SM-thread"> - <end xmi:id="_IeXP2F81EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g"> + <ownedConnector xmi:type="uml:Connector" xmi:id="_IeXP1181EeGbQoflzrdx0g" name="connector-SM-thread"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXP2F81EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXP2l81EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXP2V81EeGbQoflzrdx0g" value="1"/> <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/> </end> - <end xmi:id="_IeXP2181EeGbQoflzrdx0g" partWithPort="_IeXPxV81EeGbQoflzrdx0g"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXP2181EeGbQoflzrdx0g" partWithPort="_IeXPxV81EeGbQoflzrdx0g"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXP3V81EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXP3F81EeGbQoflzrdx0g" value="1"/> <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/> </end> </ownedConnector> - <ownedConnector xmi:id="_G9Gb4F82EeGbQoflzrdx0g" name="Connector1"> - <end xmi:id="_G9HC8F82EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g" role="_xUE3QF8wEeGerN33d-RdRg"> + <ownedConnector xmi:type="uml:Connector" xmi:id="_G9Gb4F82EeGbQoflzrdx0g" name="Connector1"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_G9HC8F82EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g" role="_xUE3QF8wEeGerN33d-RdRg"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G9HC8l82EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G9HC8V82EeGbQoflzrdx0g" value="1"/> </end> - <end xmi:id="_G9HqAF82EeGbQoflzrdx0g" partWithPort="_pTD04F81EeGbQoflzrdx0g" role="_z94Y0F81EeGbQoflzrdx0g"> + <end xmi:type="uml:ConnectorEnd" xmi:id="_G9HqAF82EeGbQoflzrdx0g" partWithPort="_pTD04F81EeGbQoflzrdx0g" role="_z94Y0F81EeGbQoflzrdx0g"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G9HqAl82EeGbQoflzrdx0g" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G9HqAV82EeGbQoflzrdx0g" value="1"/> </end> </ownedConnector> </packagedElement> </packagedElement> - <profileApplication xmi:id="_e8kikOUUEd-P08Bciq_LqQ"> - <eAnnotations xmi:id="_fAD7cOUUEd-P08Bciq_LqQ" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_e8kikOUUEd-P08Bciq_LqQ"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fAD7cOUUEd-P08Bciq_LqQ" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> </eAnnotations> - <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> </profileApplication> - <profileApplication xmi:id="_cnmBUBE1EeG3cfLoiI6G7g"> - <eAnnotations xmi:id="_cz4J0BE1EeG3cfLoiI6G7g" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_cnmBUBE1EeG3cfLoiI6G7g"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cz4J0BE1EeG3cfLoiI6G7g" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> </eAnnotations> - <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> + <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> </profileApplication> </uml:Model> <FCM:InteractionComponent xmi:id="_hanSUOUUEd-P08Bciq_LqQ" base_Class="_u-qioOUTEd-P08Bciq_LqQ"/> <FCM:Template xmi:id="_9E8EUOUUEd-P08Bciq_LqQ" base_Element="_2qJyMOUUEd-P08Bciq_LqQ" kind="LoopOperations"/> <FCM:Port xmi:id="_a45twOuMEeCTfOY57pgE3w" base_Port="_a4NKMOuMEeCTfOY57pgE3w"> - <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> + <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> </FCM:Port> <FCM:ContainerRule xmi:id="_gsWFgOusEeCTfOY57pgE3w" base_Class="_b1zNUOusEeCTfOY57pgE3w" extensionKind="Aggregation" extension="_uC4BwOusEeCTfOY57pgE3w"/> <FCM:ContainerRule xmi:id="_IDtioO68EeCZ9MjsZTV1zw" base_Class="_CV_x4O68EeCZ9MjsZTV1zw" extensionKind="InterceptAllPorts" interceptor="_hanSUOUUEd-P08Bciq_LqQ"/> <FCM:Port xmi:id="_u7qzAPRUEeCKVJwdD4MMsg" base_Port="_u7pk4PRUEeCKVJwdD4MMsg"> - <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> + <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> </FCM:Port> <FCM:ContainerRule xmi:id="_RmD0YPTXEeCn1-FCrfecFg" base_Class="_18qdsO67EeCZ9MjsZTV1zw"/> <FCM:InterceptionRule xmi:id="_Z5CnUPUQEeCn1-FCrfecFg" interceptionKind="InterceptAllIn" base_Property="_LyxAEPTXEeCn1-FCrfecFg"/> @@ -401,17 +402,19 @@ out->writeEvent (event); </FCM:DerivedElement> <FCM:Template xmi:id="_nngKECaiEeGRo-gX9igNzw" base_Element="_b5mYgCaiEeGRo-gX9igNzw"/> <FCM:Port xmi:id="_JZGWgF8xEeGerN33d-RdRg" base_Port="_xUE3QF8wEeGerN33d-RdRg"> - <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> + <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> </FCM:Port> <FCM:ContainerRule xmi:id="_IeZE8F81EeGbQoflzrdx0g" base_Class="_IeWosF81EeGbQoflzrdx0g"/> <FCM:InterceptionRule xmi:id="_IeaTEF81EeGbQoflzrdx0g" interceptionKind="InterceptAllIn" base_Property="_IeWosV81EeGbQoflzrdx0g"/> <FCM:Port xmi:id="_5cn5cF81EeGbQoflzrdx0g" base_Port="_z94Y0F81EeGbQoflzrdx0g"> - <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> + <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> </FCM:Port> <FCM:Connector xmi:id="_RfomgF82EeGbQoflzrdx0g" base_Connector="_G9Gb4F82EeGbQoflzrdx0g"> - <ic href="pathmap://QML_DISTRIBUTION/distribution.uml#_X9h_kNEBEd6acefdxFk2Lw"/> + <ic xmi:type="FCM:InteractionComponent" href="pathmap://QML_DISTRIBUTION/distribution.uml#_X9h_kNEBEd6acefdxFk2Lw"/> </FCM:Connector> <FCM:Singleton xmi:id="_uqa34F_1EeGbQoflzrdx0g" base_Class="_xELAwF81EeGbQoflzrdx0g"/> <FCM:DerivedElement xmi:id="_bmnIYF_4EeGbQoflzrdx0g" base_Element="_bmbiMF_4EeGbQoflzrdx0g" source="_N3m-oF8wEeGerN33d-RdRg"/> <FCM:DerivedElement xmi:id="_bmyukF_4EeGbQoflzrdx0g" base_Element="_bmo9kF_4EeGbQoflzrdx0g" source="_ZgY_oF8wEeGerN33d-RdRg"/> + <FCM:InstanceConfigurator xmi:id="_SdiecGGDEeO2F4QRMDSOXg" base_Class="_QH7R8GGDEeO2F4QRMDSOXg"/> + <FCM:UseInstanceConfigurator xmi:id="_VnhuMGGDEeO2F4QRMDSOXg" base_Class="_xELAwF81EeGbQoflzrdx0g" configurator="_SdiecGGDEeO2F4QRMDSOXg"/> </xmi:XMI> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml index 5018d913cea..19470e1d61b 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml @@ -97,7 +97,11 @@ </template> </extension> <extension point="org.eclipse.papyrus.qompass.designer.core.instanceConfig"> - <client class="org.eclipse.papyrus.qompass.modellibs.core.CallEventConfigurator" configuratorID="CallEventConfigurator"> + <client class="org.eclipse.papyrus.qompass.modellibs.core.iconfigurators.CallEventConfigurator" configuratorID="CallEventConfigurator"> + </client> + </extension> + <extension point="org.eclipse.papyrus.qompass.designer.core.instanceConfig"> + <client class="org.eclipse.papyrus.qompass.modellibs.core.iconfigurators.AnimServiceConfigurator" configuratorID="AnimServiceConfigurator"> </client> </extension> <extension point="org.eclipse.ui.newWizards"> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java new file mode 100644 index 00000000000..64a82385204 --- /dev/null +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java @@ -0,0 +1,68 @@ +/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Ansgar Radermacher ansgar.radermacher@cea.fr + * + *****************************************************************************/ + +package org.eclipse.papyrus.qompass.modellibs.core.iconfigurators; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils; +import org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator; +import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerContext; +import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationRTException; +import org.eclipse.uml2.uml.InstanceSpecification; +import org.eclipse.uml2.uml.NamedElement; +import org.eclipse.uml2.uml.Property; + +/** + * Configurator for the Eclipse animation server. This instance is systematically + * allocated to a node named "Eclipse" call event (for a state machine): it sets the + * portID attribute of the call event interceptor. The interceptor uses this + * attribute to initialize the portID attribute within the produced CallEvent + * data structure. + * + * @author ansgar + * + */ +public class AnimServiceConfigurator implements IInstanceConfigurator { + + public final static String eclipseAnimService = "Eclipse"; //$NON-NLS-1$ + + /** + * Configure the instance of a CallEvent interceptor. The configuration parameter is the + * index of the port which gets intercepted. It is obtained via an enumeration + * + * @see org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator#configureInstance(org.eclipse.uml2.uml.InstanceSpecification, + * org.eclipse.uml2.uml.InstanceSpecification, org.eclipse.uml2.uml.Port) + * + * @param instance + * the instance that should be configured + * @param componentPart + * the part representing this instance + * @param context + * container context + */ + public void configureInstance(InstanceSpecification instance, Property componentPart, ContainerContext context) + { + EList<InstanceSpecification> nodes = AllocUtils.getAllNodesOrThreadsParent(context.smIS); + if (nodes.size() > 0) { + InstanceSpecification node = nodes.get(0); + NamedElement animService = node.getNearestPackage().getMember(eclipseAnimService); + if (animService instanceof InstanceSpecification) { + AllocUtils.allocate(instance, (InstanceSpecification)animService); + return; + } + } + throw new TransformationRTException(String.format("Cannot find node <%s> in platform definition", eclipseAnimService)); + } + +} diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java index 147ab53e11b..a342c2a9fbb 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java @@ -12,9 +12,8 @@ * *****************************************************************************/ -package org.eclipse.papyrus.qompass.modellibs.core; +package org.eclipse.papyrus.qompass.modellibs.core.iconfigurators; -import org.eclipse.papyrus.qompass.designer.core.acceleo.UMLTool; import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils; import org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator; import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerContext; @@ -32,7 +31,7 @@ import org.eclipse.uml2.uml.Property; */ public class CallEventConfigurator implements IInstanceConfigurator { - public final static String portAttribute = "portID"; + public final static String portAttribute = "portID"; //$NON-NLS-1$ /** * Configure the instance of a CallEvent interceptor. The configuration parameter is the @@ -52,8 +51,8 @@ public class CallEventConfigurator implements IInstanceConfigurator { { if(context != null) { // make sure that there is an enum par port - String literalName = "port_" + UMLTool.varName(context.port); - // literalName = "0"; + // String literalName = "port_" + UMLTool.varName(context.port); //$NON-NLS-1$ + // the associated enumeration is declared by the statemachine (which is included by the bootloader as well) DepPlanUtils.configureProperty(instance, portAttribute, 0); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java new file mode 100644 index 00000000000..05c33faa99d --- /dev/null +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java @@ -0,0 +1,159 @@ +package org.eclipse.papyrus.qompass.modellibs.core.mappingrules; + +import java.util.Iterator; + +import org.eclipse.papyrus.FCM.Port; +import org.eclipse.papyrus.FCM.util.IMappingRule; +import org.eclipse.papyrus.FCM.util.MapUtil; +import org.eclipse.uml2.uml.Interface; +import org.eclipse.uml2.uml.Operation; +import org.eclipse.uml2.uml.Parameter; +import org.eclipse.uml2.uml.ParameterDirectionKind; +import org.eclipse.uml2.uml.Type; + + +public class AMIcallback implements IMappingRule { + + public Interface getProvided(Port p, boolean update) { + Type type = p.getBase_Port().getType(); + if(!(type instanceof Interface)) + return null; + + Interface typingInterface = (Interface)type; + Interface derivedInterface = MapUtil.getOrCreateDerivedInterface(p, "_reply_", type, update); + if (!update) { + return derivedInterface; + } + + for(Operation operation : typingInterface.getOwnedOperations()) { + String name = operation.getName(); + + if(AMIpoll.hasOutParameters(operation)) { + + // check whether operation already exists. Create, if not + Operation derivedOperation = derivedInterface.getOperation(name, null, null); + if(derivedOperation == null) { + derivedOperation = derivedInterface.createOwnedOperation(name, null, null); + } + + // each non-in parameter is in the poll operation. + for(Parameter parameter : operation.getOwnedParameters()) { + if(parameter.getDirection() != ParameterDirectionKind.IN_LITERAL) { + + String paramName = parameter.getName(); + Type paramType = parameter.getType(); + if(derivedOperation.getOwnedParameter(paramName, paramType) == null) { + Parameter newParameter = + derivedOperation.createOwnedParameter(parameter.getName(), parameter.getType()); + newParameter.setDirection(ParameterDirectionKind.IN_LITERAL); + newParameter.setLower(parameter.getLower()); + newParameter.setUpper(parameter.getUpper()); + } + } + } + + // remove those parameters that exist in derived, but not original interface. + Iterator<Parameter> derivedParameters = derivedOperation.getOwnedParameters().iterator(); + while(derivedParameters.hasNext()) { + Parameter parameter = derivedParameters.next(); + String paramName = parameter.getName(); + Type paramType = parameter.getType(); + if(operation.getOwnedParameter(paramName, paramType) == null) { + // not on in original interface, remove from derived as well + derivedParameters.remove(); + } + } + } + } + + // check whether operations in derived interface exist in original interface + // (remove, if not) + Iterator<Operation> derivedOperations = derivedInterface.getOwnedOperations().iterator(); + while(derivedOperations.hasNext()) { + Operation derivedOperation = derivedOperations.next(); + String name = derivedOperation.getName(); + if(name == null) { + continue; + } + if(typingInterface.getOperation(name, null, null) == null) { + // not in typing interface, remove + derivedOperations.remove(); + } + } + return derivedInterface; + } + + public Interface getRequired(Port p, boolean update) { + Type type = p.getBase_Port().getType(); + if(!(type instanceof Interface)) + return null; + + Interface typingInterface = (Interface)type; + Interface derivedInterface = MapUtil.getOrCreateDerivedInterface(p, "_req_", type, update); //$NON-NLS-1$ + if (!update) { + return derivedInterface; + } + + for(Operation operation : typingInterface.getOwnedOperations()) { + String name = operation.getName(); + + // check whether operation already exists. Create, if not + Operation derivedOperation = derivedInterface.getOperation(name, null, null); + if(derivedOperation == null) { + derivedOperation = derivedInterface.createOwnedOperation(name, null, null); + } + + // request operation contains only in and inout parameters + for(Parameter parameter : operation.getOwnedParameters()) { + if((parameter.getDirection() == ParameterDirectionKind.IN_LITERAL) || + (parameter.getDirection() == ParameterDirectionKind.INOUT_LITERAL)) { + + String paramName = parameter.getName(); + Type paramType = parameter.getType(); + if(derivedOperation.getOwnedParameter(paramName, paramType) == null) { + Parameter newParameter = + derivedOperation.createOwnedParameter(parameter.getName(), parameter.getType()); + newParameter.setDirection(parameter.getDirection()); + newParameter.setLower(parameter.getLower()); + newParameter.setUpper(parameter.getUpper()); + } + } + } + + // remove those parameters that exist in derived, but not original interface. + Iterator<Parameter> derivedParameters = derivedOperation.getOwnedParameters().iterator(); + while(derivedParameters.hasNext()) { + Parameter parameter = derivedParameters.next(); + String paramName = parameter.getName(); + Type paramType = parameter.getType(); + if(operation.getOwnedParameter(paramName, paramType) == null) { + // not on in original interface, remove from derived as well + derivedParameters.remove(); + } + } + } + + // check whether operations in derived interface exist in original interface + // (remove, if not) + Iterator<Operation> derivedOperations = derivedInterface.getOwnedOperations().iterator(); + while(derivedOperations.hasNext()) { + Operation derivedOperation = derivedOperations.next(); + String name = derivedOperation.getName(); + if(name == null) { + continue; + } + if(typingInterface.getOperation(name, null, null) == null) { + // not in typing interface, remove + derivedOperations.remove(); + } + } + + return derivedInterface; + } + + public boolean needsUpdate(Port p) { + // TODO: insufficient condition + return (getRequired(p, false) == null) || + (getProvided(p, false) == null); + } +} diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java new file mode 100644 index 00000000000..53e395b0077 --- /dev/null +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java @@ -0,0 +1,158 @@ +/***************************************************************************** + * Copyright (c) 2013 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Ansgar Radermacher ansgar.radermacher@cea.fr + * + *****************************************************************************/ + +package org.eclipse.papyrus.qompass.modellibs.core.mappingrules; + +import java.util.Iterator; + +import org.eclipse.papyrus.FCM.Port; +import org.eclipse.papyrus.FCM.util.IMappingRule; +import org.eclipse.papyrus.FCM.util.MapUtil; +import org.eclipse.uml2.uml.Interface; +import org.eclipse.uml2.uml.Operation; +import org.eclipse.uml2.uml.Parameter; +import org.eclipse.uml2.uml.ParameterDirectionKind; +import org.eclipse.uml2.uml.Type; + + +/** + * Implement a CORBA AMI style polling interface + * This is defined in the CORBA 3 standard in section 22.6.2 + * A difference is that we do not return the poller object, but the client uses the original port. + * This has the consequence that it is not possible to make multiple asynchronous requests. + * + * A second difference is that we do not keep the normal methods in the same interface and prefix the + * new ones. (which would probably be a good idea). + * + * @author ansgar + * + */ +public class AMIpoll implements IMappingRule { + + + public Interface getProvided(Port p, boolean update) { + return null; + } + + public Interface getRequired(Port p, boolean update) { + Type type = p.getBase_Port().getType(); + if(!(type instanceof Interface)) + return null; + + Interface typingInterface = (Interface)type; + Interface derivedInterface = MapUtil.getOrCreateDerivedInterface(p, "_", type, update); //$NON-NLS-1$ + if (!update) { + return derivedInterface; + } + + for(Operation operation : typingInterface.getOwnedOperations()) { + String name = operation.getName(); + + // check whether operation already exists. Create, if not + Operation derivedOperation = derivedInterface.getOperation(name, null, null); + if(derivedOperation == null) { + derivedOperation = derivedInterface.createOwnedOperation(name, null, null); + } + + if(hasOutParameters(operation)) { + String pollName = name + "Poll"; //$NON-NLS-1$ + Operation derivedPollOperation = derivedInterface.getOperation(pollName, null, null); + if(derivedPollOperation == null) { + derivedPollOperation = derivedInterface.createOwnedOperation(pollName, null, null); + } + + // each non-in parameter is in the poll operation. + derivedPollOperation.createOwnedParameter("timeout", null); //$NON-NLS-1$ + + for(Parameter parameter : operation.getOwnedParameters()) { + if(parameter.getDirection() != ParameterDirectionKind.IN_LITERAL) { + + String paramName = parameter.getName(); + Type paramType = parameter.getType(); + if(derivedPollOperation.getOwnedParameter(paramName, paramType) == null) { + Parameter newParameter = + derivedPollOperation.createOwnedParameter(parameter.getName(), parameter.getType()); + newParameter.setDirection(parameter.getDirection()); + newParameter.setLower(parameter.getLower()); + newParameter.setUpper(parameter.getUpper()); + } + } + } + } + // each in and inout parameter is in the request operation. + for(Parameter parameter : operation.getOwnedParameters()) { + if((parameter.getDirection() == ParameterDirectionKind.IN_LITERAL) || + (parameter.getDirection() == ParameterDirectionKind.INOUT_LITERAL)) { + + String paramName = parameter.getName(); + Type paramType = parameter.getType(); + if(derivedOperation.getOwnedParameter(paramName, paramType) == null) { + Parameter newParameter = + derivedOperation.createOwnedParameter(parameter.getName(), parameter.getType()); + newParameter.setDirection(parameter.getDirection()); + newParameter.setLower(parameter.getLower()); + newParameter.setUpper(parameter.getUpper()); + } + } + } + // remove those parameters that exist in derived, but not original interface. + Iterator<Parameter> derivedParameters = derivedOperation.getOwnedParameters().iterator(); + while(derivedParameters.hasNext()) { + Parameter parameter = derivedParameters.next(); + String paramName = parameter.getName(); + Type paramType = parameter.getType(); + if((!paramName.equals("timeout")) && //$NON-NLS-1$ + (operation.getOwnedParameter(paramName, paramType) == null)) { + // not on in original interface, remove from derived as well + derivedParameters.remove(); + } + } + } + + // check whether operations in derived interface exist in original interface + // (remove, if not) + Iterator<Operation> derivedOperations = derivedInterface.getOwnedOperations().iterator(); + while(derivedOperations.hasNext()) { + Operation derivedOperation = derivedOperations.next(); + String name = derivedOperation.getName(); + if(name == null) { + continue; + } + if(name.endsWith("Poll")) { //$NON-NLS-1$ + // remove Poll postfix + name = name.substring(0, name.length() - 4); + } + if(typingInterface.getOperation(name, null, null) == null) { + // not in typing interface, remove + derivedOperations.remove(); + } + } + + return derivedInterface; + } + + public static boolean hasOutParameters(Operation operation) { + for(Parameter parameter : operation.getOwnedParameters()) { + if(parameter.getDirection() != ParameterDirectionKind.IN_LITERAL) { + return true; + } + } + return false; + } + + public boolean needsUpdate(Port p) { + // TODO: insufficient condition + return (getRequired(p, false) == null); + } +} diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java index df6d02d5e56..0010236de70 100644 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java +++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java @@ -93,7 +93,7 @@ public class PullConsumer implements IMappingRule { Element owner = umlPort.getOwner(); String ownerStr = ""; //$NON-NLS-1$ if(owner instanceof NamedElement) { - ownerStr = " of class " + ((NamedElement)owner).getQualifiedName(); + ownerStr = " of class " + ((NamedElement)owner).getQualifiedName(); //$NON-NLS-1$ } Log.log(Status.INFO, Log.CALC_PORTKIND, p.getKind().getBase_Class().getName() + " => GetRequired on " + umlPort.getName() + ownerStr); diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ClientServerTimerTmp.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ClientServerTimerTmp.uml deleted file mode 100644 index dff0d18210d..00000000000 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ClientServerTimerTmp.uml +++ /dev/null @@ -1,290 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" 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/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc"> - <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ClientServerTimer"> - <packageImport xmi:id="_Z4LvQBqvEeOvgeTpolSdGg"> - <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> - </packageImport> - <packageImport xmi:id="_Z4MWUBqvEeOvgeTpolSdGg"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/> - </packageImport> - <packageImport xmi:id="_Z4M9YBqvEeOvgeTpolSdGg"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/> - </packageImport> - <packagedElement xmi:type="uml:Package" xmi:id="_Z4NkcBqvEeOvgeTpolSdGg" name="globalenums"/> - <packagedElement xmi:type="uml:Package" xmi:id="_Z4TEABqvEeOvgeTpolSdGg" name="deployment"> - <packagedElement xmi:type="uml:Package" xmi:id="_Z4TEARqvEeOvgeTpolSdGg" name="linux"> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_Z4TrEBqvEeOvgeTpolSdGg" clientDependency="_aD2zwBqvEeOvgeTpolSdGg" name="mySystem" classifier="_bYJagDLiEd2RVeNawwNNzg"> - <slot xmi:id="_aEGEUBqvEeOvgeTpolSdGg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> - <value xmi:type="uml:InstanceValue" xmi:id="_aEGEURqvEeOvgeTpolSdGg" instance="_aEBL0BqvEeOvgeTpolSdGg"/> - </slot> - <slot xmi:id="_aEHScBqvEeOvgeTpolSdGg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg"> - <value xmi:type="uml:InstanceValue" xmi:id="_aEH5gBqvEeOvgeTpolSdGg" instance="_aEGrYBqvEeOvgeTpolSdGg"/> - </slot> - <slot xmi:id="_aEOnMBqvEeOvgeTpolSdGg" definingFeature="_lKtZUCjYEeGFbebITJYb9g"> - <value xmi:type="uml:InstanceValue" xmi:id="_aEOnMRqvEeOvgeTpolSdGg" instance="_aEH5gRqvEeOvgeTpolSdGg"/> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:Abstraction" xmi:id="_aD2zwBqvEeOvgeTpolSdGg" name="allocate mySystem to linux" client="_Z4TrEBqvEeOvgeTpolSdGg" supplier="_6EgaIDa3EeGBl4WmUxMhOA"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEBL0BqvEeOvgeTpolSdGg" name="mySystem.server" classifier="_oqZNUDLaEd2qeKRLMdIx_A"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEGrYBqvEeOvgeTpolSdGg" name="mySystem.client" classifier="_IfjoETLbEd2qeKRLMdIx_A"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEH5gRqvEeOvgeTpolSdGg" name="mySystem.timer"> - <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-X6zMCjZEeGFbebITJYb9g"/> - <slot xmi:id="_aEK80hqvEeOvgeTpolSdGg"> - <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_ARs_UCjaEeGFbebITJYb9g"/> - <value xmi:type="uml:InstanceValue" xmi:id="_aELj4BqvEeOvgeTpolSdGg" instance="_aEJHoBqvEeOvgeTpolSdGg"/> - </slot> - <slot xmi:id="_aEOAIBqvEeOvgeTpolSdGg"> - <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_RMqEkCjaEeGFbebITJYb9g"/> - <value xmi:type="uml:InstanceValue" xmi:id="_aEOAIRqvEeOvgeTpolSdGg" instance="_aEMK8BqvEeOvgeTpolSdGg"/> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEJHoBqvEeOvgeTpolSdGg" name="mySystem.timer.timer"> - <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_9V8OQCjYEeGFbebITJYb9g"/> - <slot xmi:id="_aEK80BqvEeOvgeTpolSdGg"> - <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_tmNeoCjbEeGFbebITJYb9g"/> - <value xmi:type="uml:LiteralInteger" xmi:id="_aEK80RqvEeOvgeTpolSdGg" name="value for periodLength" value="250"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </value> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEMK8BqvEeOvgeTpolSdGg" name="mySystem.timer.thread"> - <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/> - </packagedElement> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_Z4USIBqvEeOvgeTpolSdGg" name="ComponentModel"> - <packagedElement xmi:type="uml:Package" xmi:id="_Z4USIRqvEeOvgeTpolSdGg" name="System"> - <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="System_impl"> - <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="server" type="_oqZNUDLaEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/> - <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="client" visibility="public" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_d5JgYFl6EeKFQZ_XV_Kn6g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d5KugFl6EeKFQZ_XV_Kn6g" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_d5MjsFl6EeKFQZ_XV_Kn6g"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <ownedAttribute xmi:id="_lKtZUCjYEeGFbebITJYb9g" name="timer" visibility="public" aggregation="composite"> - <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-X6zMCjZEeGFbebITJYb9g"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ofEtECjYEeGFbebITJYb9g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ofGiQCjYEeGFbebITJYb9g" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_ofI-gCjYEeGFbebITJYb9g"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <ownedConnector xmi:id="_fXbtMACUEd-PD8FdFs7bpA" name="qpconnector"> - <end xmi:id="_fYI30ACUEd-PD8FdFs7bpA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A"/> - <end xmi:id="_fYLUEACUEd-PD8FdFs7bpA" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_4KiE8DLbEd2qeKRLMdIx_A"/> - </ownedConnector> - <ownedConnector xmi:id="_s0Ev4CkDEeGDDbdzqSb4UA" name="Connector1"> - <end xmi:id="_s0FW8CkDEeGDDbdzqSb4UA" partWithPort="_lKtZUCjYEeGFbebITJYb9g"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s0FW8ikDEeGDDbdzqSb4UA" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s0FW8SkDEeGDDbdzqSb4UA" value="1"/> - <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_3NSGwCkAEeGDDbdzqSb4UA"/> - </end> - <end xmi:id="_s0FW8ykDEeGDDbdzqSb4UA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_U50WMCkDEeGDDbdzqSb4UA"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s0FW9SkDEeGDDbdzqSb4UA" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s0FW9CkDEeGDDbdzqSb4UA" value="1"/> - </end> - </ownedConnector> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_Z4WuYBqvEeOvgeTpolSdGg" name="Server"> - <packagedElement xmi:type="uml:Class" xmi:id="_oqZNUDLaEd2qeKRLMdIx_A" clientDependency="_YQqH0JYlEd6G9q9hwr11bw" name="CServer_impl"> - <ownedAttribute xmi:type="uml:Port" xmi:id="_4KiE8DLbEd2qeKRLMdIx_A" name="p" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/> - <interfaceRealization xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw"> - <language>C/C++</language> - <body>cout << "server: got add request for a=" << a << " and b=" << b << endl; -return a+b;</body> - </ownedBehavior> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_I1R3YAcDEeGnrLqQ0OQeAg" name="mult" specification="_4ZEZwHecEd6r18stFZxmFQ"> - <language>C/C++</language> - <body>cout << "server: got mult request for a=" << a << " and b=" << b << endl; -return a*b;</body> - </ownedBehavior> - <ownedOperation xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ"> - <ownedParameter xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedParameter> - <ownedParameter xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedParameter> - <ownedParameter xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedParameter> - </ownedOperation> - <ownedOperation xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg"> - <ownedParameter xmi:id="_4ZEZwXecEd6r18stFZxmFQ" name="a"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedParameter> - <ownedParameter xmi:id="_4ZEZwnecEd6r18stFZxmFQ" name="b"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedParameter> - <ownedParameter xmi:id="_4ZEZw3ecEd6r18stFZxmFQ" name="res" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedParameter> - </ownedOperation> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_Z4_nkBqvEeOvgeTpolSdGg" name="Interfaces"> - <packagedElement xmi:type="uml:Interface" xmi:id="_cn-H0DLbEd2qeKRLMdIx_A" name="ICompute"> - <ownedOperation xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add" isAbstract="true"> - <ownedParameter xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6xDLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> - </ownedParameter> - <ownedParameter xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6yDLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> - </ownedParameter> - <ownedParameter xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6zDLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> - </ownedParameter> - </ownedOperation> - <ownedOperation xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true"> - <ownedParameter xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY9DLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> - </ownedParameter> - <ownedParameter xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY-DLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> - </ownedParameter> - <ownedParameter xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY_DLgEd28fJKJJnUaeQ"> - <value xsi:nil="true"/> - </defaultValue> - </ownedParameter> - </ownedOperation> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_Z-a6IBqvEeOvgeTpolSdGg" name="Client"> - <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_vdcwkKDcEd-t8JNe-ruCrQ _qfhbMCozEeGxrprK9wB9iA" name="CClient_impl"> - <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA"> - <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/> - </generalization> - <ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/> - <ownedAttribute xmi:type="uml:Port" xmi:id="_U50WMCkDEeGDDbdzqSb4UA" name="tick" aggregation="composite"> - <type xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_Xb-y0AweEd6it_RkGhz_AA"/> - </ownedAttribute> - <interfaceRealization xmi:id="_vdcwkKDcEd-t8JNe-ruCrQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - </interfaceRealization> - <interfaceRealization xmi:id="_qfhbMCozEeGxrprK9wB9iA" name="derived realization of ITick" client="_IfjoETLbEd2qeKRLMdIx_A"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_Xb-y0AweEd6it_RkGhz_AA"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_Xb-y0AweEd6it_RkGhz_AA"/> - </interfaceRealization> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_4CRrYHpbEd-X4Z9aZ0cpCQ"> - <language>C/C++</language> - <body>cout << "call via port q: add(2, 3);" << endl; -cout << "result: " << q->add(2, 3) << endl; -cout << "now sleeping 10 seconds" << endl; -sleep(10); -cout << "finishing CClient_impl::run" << endl;</body> - </ownedBehavior> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_w5uegCozEeGxrprK9wB9iA" name="tick" specification="_qf6cwCozEeGxrprK9wB9iA"> - <language>C/C++</language> - <body>cout << "call via port tick: mult(4, 5);" << endl; -cout << "result: " << q->mult(4, 5) << endl;</body> - </ownedBehavior> - <ownedOperation xmi:id="_4CRrYHpbEd-X4Z9aZ0cpCQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/> - <ownedOperation xmi:id="_qf6cwCozEeGxrprK9wB9iA" name="tick" method="_w5uegCozEeGxrprK9wB9iA"/> - </packagedElement> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_aDg1gBqvEeOvgeTpolSdGg" name="PlatformModel"> - <packagedElement xmi:type="uml:Package" xmi:id="_aDg1gRqvEeOvgeTpolSdGg" name="HWArchitectureLinuxPlatform"> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_6EgaIDa3EeGBl4WmUxMhOA" name="linux" classifier="_zY9vMDLiEd2RVeNawwNNzg"/> - </packagedElement> - <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="LinuxHost"/> - </packagedElement> - <profileApplication xmi:id="_Zyy48BqvEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_Zyy48RqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/> - </eAnnotations> - <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/> - </profileApplication> - <profileApplication xmi:id="_ZzDXoBqvEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_ZzDXoRqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> - </eAnnotations> - <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> - </profileApplication> - <profileApplication xmi:id="_ZzakABqvEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_ZzakARqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> - </eAnnotations> - <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> - </profileApplication> - <profileApplication xmi:id="_Z4Hd0BqvEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_Z4Hd0RqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_Z4JTABqvEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_Z4JTARqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_Z4LIMBqvEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_Z4LIMRqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - </uml:Model> - <FCM:RuleApplication xmi:id="_Z4q3cBqvEeOvgeTpolSdGg" base_Class="_oqZNUDLaEd2qeKRLMdIx_A"> - <containerRule href="pathmap://QML_TRACE/tracing.uml#_ISo6gLdwEd-CtfrGQre34Q"/> - </FCM:RuleApplication> - <C_Cpp:Include xmi:id="_Z4454BqvEeOvgeTpolSdGg" body="#include <iostream>
using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/> - <FCM:Port xmi:id="_Z54_cBqvEeOvgeTpolSdGg" base_Port="_4KiE8DLbEd2qeKRLMdIx_A"> - <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:DerivedElement xmi:id="_Z666MBqvEeOvgeTpolSdGg" base_Element="_TbIjUJYlEd6G9q9hwr11bw" source="_DGs6wDLgEd28fJKJJnUaeQ"/> - <FCM:DerivedElement xmi:id="_Z8-vsBqvEeOvgeTpolSdGg" base_Element="_4ZEZwHecEd6r18stFZxmFQ" source="_L8EY8DLgEd28fJKJJnUaeQ"/> - <C_Cpp:Include xmi:id="_Z-sm8BqvEeOvgeTpolSdGg" body="#include <iostream>
using namespace std;

#include <unistd.h>" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> - <FCM:Port xmi:id="_Z_4SsBqvEeOvgeTpolSdGg" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"> - <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:Port xmi:id="_aAaeMBqvEeOvgeTpolSdGg" base_Port="_U50WMCkDEeGDDbdzqSb4UA"> - <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:DerivedElement xmi:id="_aBhRcBqvEeOvgeTpolSdGg" base_Element="_4CRrYHpbEd-X4Z9aZ0cpCQ"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_aCL_0BqvEeOvgeTpolSdGg" base_Element="_qf6cwCozEeGxrprK9wB9iA"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_asFRoAweEd6it_RkGhz_AA"/> - </FCM:DerivedElement> - <FCM:Target xmi:id="_aDr0oBqvEeOvgeTpolSdGg" base_Node="_zY9vMDLiEd2RVeNawwNNzg"> - <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> - <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> - </FCM:Target> - <Alloc:Allocate xmi:id="_aD_WoBqvEeOvgeTpolSdGg" base_Abstraction="_aD2zwBqvEeOvgeTpolSdGg"/> -</xmi:XMI> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/HelloWorldTmp.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/HelloWorldTmp.uml deleted file mode 100644 index 86722ad1091..00000000000 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/HelloWorldTmp.uml +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" 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/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc"> - <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="HelloWorld"> - <packageImport xmi:id="_qjz7QhsAEeOvgeTpolSdGg"> - <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> - </packageImport> - <packageImport xmi:id="_qjz7QxsAEeOvgeTpolSdGg"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/> - </packageImport> - <packageImport xmi:id="_qjz7RBsAEeOvgeTpolSdGg"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/> - </packageImport> - <packagedElement xmi:type="uml:Package" xmi:id="_qj0iUBsAEeOvgeTpolSdGg" name="globalenums"/> - <packagedElement xmi:type="uml:Package" xmi:id="_qj0iURsAEeOvgeTpolSdGg" name="deployment"> - <packagedElement xmi:type="uml:Package" xmi:id="_qj0iUhsAEeOvgeTpolSdGg" name="SystemDepPlan"> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_qj0iUxsAEeOvgeTpolSdGg" clientDependency="_qka_QBsAEeOvgeTpolSdGg" name="mainInstance" classifier="_bYJagDLiEd2RVeNawwNNzg"> - <slot xmi:id="_qkhF4BsAEeOvgeTpolSdGg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> - <value xmi:type="uml:InstanceValue" xmi:id="_qkhF4RsAEeOvgeTpolSdGg" instance="_qkeCkBsAEeOvgeTpolSdGg"/> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:Abstraction" xmi:id="_qka_QBsAEeOvgeTpolSdGg" name="allocate mainInstance to monoNode" client="_qj0iUxsAEeOvgeTpolSdGg" supplier="_GQ1ekKwHEeCQX8uv_p0Q4A"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_qkeCkBsAEeOvgeTpolSdGg" name="mainInstance.hello" classifier="_tyiqsc__Ed-TP80eVS-2Rg"> - <slot xmi:id="_qkge0BsAEeOvgeTpolSdGg" definingFeature="_8pupUFTzEeKvFeqt5Q_lqw"> - <value xmi:type="uml:LiteralString" xmi:id="_qkge0RsAEeOvgeTpolSdGg" name="value for message" value=""Test message""> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> - </value> - </slot> - </packagedElement> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_qj1JYBsAEeOvgeTpolSdGg" name="components"> - <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="System"> - <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="hello" visibility="public" type="_tyiqsc__Ed-TP80eVS-2Rg" isUnique="false" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dCT24G6JEeGqWMX2LwdLDw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dCUd8G6JEeGqWMX2LwdLDw" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_dCWTIG6JEeGqWMX2LwdLDw"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_tyiqsc__Ed-TP80eVS-2Rg" clientDependency="_Us15gFTzEeKvFeqt5Q_lqw" name="HelloWorld"> - <generalization xmi:id="_tyiqss__Ed-TP80eVS-2Rg"> - <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/> - </generalization> - <ownedAttribute xmi:id="_8pupUFTzEeKvFeqt5Q_lqw" name="message" visibility="public" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__HwK8FTzEeKvFeqt5Q_lqw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__HwyAFTzEeKvFeqt5Q_lqw" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="__HynMFTzEeKvFeqt5Q_lqw"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <interfaceRealization xmi:id="_Us15gFTzEeKvFeqt5Q_lqw" name="derived realization of IStart" client="_tyiqsc__Ed-TP80eVS-2Rg"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - </interfaceRealization> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_tyjRwc__Ed-TP80eVS-2Rg" name="run" specification="_UtCt0FTzEeKvFeqt5Q_lqw"> - <language>C/C++</language> - <body>cout << "Hello world: " << message << endl;</body> - </ownedBehavior> - <ownedOperation xmi:id="_UtCt0FTzEeKvFeqt5Q_lqw" name="run" method="_tyjRwc__Ed-TP80eVS-2Rg"/> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_qkVfsBsAEeOvgeTpolSdGg" name="platform"> - <packagedElement xmi:type="uml:Package" xmi:id="_qkVfsRsAEeOvgeTpolSdGg" name="HWArchitecturePlatform"> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_GQ1ekKwHEeCQX8uv_p0Q4A" name="monoNode" classifier="_zY9vMDLiEd2RVeNawwNNzg"/> - </packagedElement> - <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/> - </packagedElement> - <profileApplication xmi:id="_qjyGEBsAEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_qjyGERsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/> - </eAnnotations> - <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/> - </profileApplication> - <profileApplication xmi:id="_qjytIBsAEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_qjytIRsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> - </eAnnotations> - <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> - </profileApplication> - <profileApplication xmi:id="_qjytIhsAEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_qjytIxsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> - </eAnnotations> - <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> - </profileApplication> - <profileApplication xmi:id="_qjzUMBsAEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_qjzUMRsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_qjzUMhsAEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_qjzUMxsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_qjz7QBsAEeOvgeTpolSdGg"> - <eAnnotations xmi:id="_qjz7QRsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - </uml:Model> - <FCM:CodeGenOptions xmi:id="_qj3loBsAEeOvgeTpolSdGg" base_Package="_qj1JYBsAEeOvgeTpolSdGg"> - <progLanguage href="pathmap://QML_CORE/core.uml#_5WrSINzEEeKPWMO32vUmzw"/> - </FCM:CodeGenOptions> - <C_Cpp:Include xmi:id="_qj73EBsAEeOvgeTpolSdGg" body="#include <iostream>
using namespace std;" base_class="_tyiqsc__Ed-TP80eVS-2Rg"/> - <FCM:ConfigurationProperty xmi:id="_qkEZ8BsAEeOvgeTpolSdGg" base_Property="_8pupUFTzEeKvFeqt5Q_lqw"/> - <FCM:DerivedElement xmi:id="_qkQnMBsAEeOvgeTpolSdGg" base_Element="_UtCt0FTzEeKvFeqt5Q_lqw"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> - </FCM:DerivedElement> - <FCM:Target xmi:id="_qkYjABsAEeOvgeTpolSdGg" base_Node="_zY9vMDLiEd2RVeNawwNNzg"> - <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> - <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> - </FCM:Target> - <Alloc:Allocate xmi:id="_qkdbgBsAEeOvgeTpolSdGg" base_Abstraction="_qka_QBsAEeOvgeTpolSdGg"/> -</xmi:XMI> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.di deleted file mode 100644 index ae313072c4f..00000000000 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.di +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi"> - <pageList/> - <sashModel currentSelection="//@sashModel/@windows.0/@children.0"> - <windows> - <children xsi:type="di:TabFolder"/> - </windows> - </sashModel> -</di:SashWindowsMngr> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.notation deleted file mode 100644 index bf9abab340f..00000000000 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.notation +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml deleted file mode 100644 index ad75c145709..00000000000 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml +++ /dev/null @@ -1,466 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:GCM="http://www.eclipse.org/papyrus/GCM/1" 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/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc http://www.eclipse.org/papyrus/GCM/1 http://www.eclipse.org/papyrus/MARTE/1#//GCM"> - <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ProducerConsumer"> - <packageImport xmi:id="_LVb5cix0EeOWeqhsjwDAlw"> - <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> - </packageImport> - <packageImport xmi:id="_LVb5cyx0EeOWeqhsjwDAlw"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/> - </packageImport> - <packageImport xmi:id="_LVb5dCx0EeOWeqhsjwDAlw"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/> - </packageImport> - <packageImport xmi:id="_LVcggCx0EeOWeqhsjwDAlw"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/fifo.uml#_ePwqkHLmEd6R5tffIPrlPg"/> - </packageImport> - <packagedElement xmi:type="uml:Package" xmi:id="_LVcggSx0EeOWeqhsjwDAlw" name="globalenums"/> - <packagedElement xmi:type="uml:Package" xmi:id="_LVdHkCx0EeOWeqhsjwDAlw" name="deployment"> - <packagedElement xmi:type="uml:Package" xmi:id="_LVdHkSx0EeOWeqhsjwDAlw" name="monoPull"> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LVdHkix0EeOWeqhsjwDAlw" clientDependency="_LVuNUCx0EeOWeqhsjwDAlw" name="mainInstance" classifier="_bYJagDLiEd2RVeNawwNNzg"> - <slot xmi:id="_LV1iECx0EeOWeqhsjwDAlw" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> - <value xmi:type="uml:InstanceValue" xmi:id="_LV1iESx0EeOWeqhsjwDAlw" instance="_LV07ACx0EeOWeqhsjwDAlw"/> - </slot> - <slot xmi:id="_LV2JICx0EeOWeqhsjwDAlw" definingFeature="_i-I7gDLiEd2RVeNawwNNzg"> - <value xmi:type="uml:InstanceValue" xmi:id="_LV2JISx0EeOWeqhsjwDAlw" instance="_LV1iEix0EeOWeqhsjwDAlw"/> - </slot> - <slot xmi:id="_LV5zgix0EeOWeqhsjwDAlw" definingFeature="_ei8sYBSoEeOUifYpcO0mcw"> - <value xmi:type="uml:InstanceValue" xmi:id="_LV5zgyx0EeOWeqhsjwDAlw" instance="_LV4lYCx0EeOWeqhsjwDAlw"/> - </slot> - <slot xmi:id="_LYChgCx0EeOWeqhsjwDAlw" definingFeature="p_efVI0E2rEeGl8qrc8BM7vA"> - <value xmi:type="uml:InstanceValue" xmi:id="_LYChgSx0EeOWeqhsjwDAlw" instance="_LYBTYCx0EeOWeqhsjwDAlw"/> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:Abstraction" xmi:id="_LVuNUCx0EeOWeqhsjwDAlw" name="allocate mainInstance to monoNode" client="_LVdHkix0EeOWeqhsjwDAlw" supplier="_GQ1ekKwHEeCQX8uv_p0Q4A"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LV07ACx0EeOWeqhsjwDAlw" name="mainInstance.con" classifier="_tyiqsc__Ed-TP80eVS-2Rg"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LV1iEix0EeOWeqhsjwDAlw" name="mainInstance.prod" classifier="_IfjoETLbEd2qeKRLMdIx_A"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LV2wMCx0EeOWeqhsjwDAlw" name="mainInstance.main"> - <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LV4lYCx0EeOWeqhsjwDAlw" name="mainInstance.pullConThread"> - <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/> - <slot xmi:id="_LV5zgCx0EeOWeqhsjwDAlw"> - <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_rVfYoMGJEd-Mveea1W_olA"/> - <value xmi:type="uml:LiteralInteger" xmi:id="_LV5zgSx0EeOWeqhsjwDAlw" name="value for priority" value="5"> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> - </value> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LYBTYCx0EeOWeqhsjwDAlw" name="mainInstance.fifoconnector"> - <classifier xmi:type="uml:Class" href="/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml#_Y1jF8HPpEd6R5tffIPrlPg"/> - <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/fifo.uml#_Y1jF8HPpEd6R5tffIPrlPg"/> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_zwUHQLF4EeC9yscvWqW-eg" name="mainInstance.fifoconnector"> - <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/fifo.uml#_Y1jF8HPpEd6R5tffIPrlPg"/> - <slot xmi:id="_zwUHQbF4EeC9yscvWqW-eg"> - <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/fifo.uml#_XDRnoHUIEd6R5tffIPrlPg"/> - <value xmi:type="uml:LiteralInteger" xmi:id="_zwUuULF4EeC9yscvWqW-eg" name="value for m_size" value="30"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </value> - </slot> - </packagedElement> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_LVdHkyx0EeOWeqhsjwDAlw" name="components"> - <packagedElement xmi:type="uml:Package" xmi:id="_LVduoCx0EeOWeqhsjwDAlw" name="System"> - <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="SystemPull_impl"> - <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" clientDependency="_9dY5YBSqEeOUifYpcO0mcw" name="con" visibility="public" type="_tyiqsc__Ed-TP80eVS-2Rg" isUnique="false" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dCT24G6JEeGqWMX2LwdLDw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dCUd8G6JEeGqWMX2LwdLDw" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_dCWTIG6JEeGqWMX2LwdLDw"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <ownedAttribute xmi:id="_ei8sYBSoEeOUifYpcO0mcw" name="pullConThread" visibility="public" aggregation="composite"> - <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mx3OkBSoEeOUifYpcO0mcw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_myNz4BSoEeOUifYpcO0mcw" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_mzF9oBSoEeOUifYpcO0mcw"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" clientDependency="_--_2EBSqEeOUifYpcO0mcw" name="prod" visibility="public" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_esReUG6JEeGqWMX2LwdLDw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_esSscG6JEeGqWMX2LwdLDw" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_esUhoG6JEeGqWMX2LwdLDw"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <ownedAttribute xmi:id="p_efVI0E2rEeGl8qrc8BM7vA" name="fifoconnector" type="_Y1jF8HPpEd6R5tffIPrlPg" aggregation="composite"/> - <ownedConnector xmi:id="_efVI0E2rEeGl8qrc8BM7vA0" name="c fifoconnector 0"> - <end xmi:id="_LX_eMix0EeOWeqhsjwDAlw" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A"/> - <end xmi:id="_LX_eMyx0EeOWeqhsjwDAlw" partWithPort="p_efVI0E2rEeGl8qrc8BM7vA" role="_xHb7MHLmEd6R5tffIPrlPg"/> - </ownedConnector> - <ownedConnector xmi:id="_efVI0E2rEeGl8qrc8BM7vA1" name="c fifoconnector 1"> - <end xmi:id="_LYAFQSx0EeOWeqhsjwDAlw" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_tyiqs8__Ed-TP80eVS-2Rg"/> - <end xmi:id="_LYAFQix0EeOWeqhsjwDAlw" partWithPort="p_efVI0E2rEeGl8qrc8BM7vA" role="_xcu1wHLmEd6R5tffIPrlPg"/> - </ownedConnector> - <ownedConnector xmi:id="_LYDIkCx0EeOWeqhsjwDAlw" name="alloc to pullConThread"> - <end xmi:id="_LYDIkSx0EeOWeqhsjwDAlw" partWithPort="_gV1cgDLiEd2RVeNawwNNzg"> - <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/> - </end> - <end xmi:id="_LYDIkix0EeOWeqhsjwDAlw" partWithPort="_ei8sYBSoEeOUifYpcO0mcw"> - <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/> - </end> - </ownedConnector> - </packagedElement> - <packagedElement xmi:type="uml:Abstraction" xmi:id="_9dY5YBSqEeOUifYpcO0mcw" name="Allocate" client="_gV1cgDLiEd2RVeNawwNNzg" supplier="_ei8sYBSoEeOUifYpcO0mcw"/> - <packagedElement xmi:type="uml:Abstraction" xmi:id="_--_2EBSqEeOUifYpcO0mcw" name="Allocate" client="_i-I7gDLiEd2RVeNawwNNzg"/> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_LVeVsix0EeOWeqhsjwDAlw" name="PullConsumer"> - <packagedElement xmi:type="uml:Class" xmi:id="_tyiqsc__Ed-TP80eVS-2Rg" clientDependency="_DHTiQDF7EeCpQdhNuFCtew" name="PullConsumer_impl"> - <generalization xmi:id="_tyiqss__Ed-TP80eVS-2Rg"> - <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/> - </generalization> - <ownedAttribute xmi:type="uml:Port" xmi:id="_tyiqs8__Ed-TP80eVS-2Rg" name="p" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"/> - <interfaceRealization xmi:id="_DHTiQDF7EeCpQdhNuFCtew" name="derived realization of ILifeCycle" client="_tyiqsc__Ed-TP80eVS-2Rg"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - </interfaceRealization> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_tyjRwc__Ed-TP80eVS-2Rg" name="activate" specification="_tyjRy8__Ed-TP80eVS-2Rg"> - <language>C/C++</language> - <body>cout << "wait for data on port p" << endl; -for (int i = 0; i<25; i++) { - if (p->hasData ()) { - components::interfaces::PubData data = p->pull (); - cout << "received data: x = " << data.x << " y = " << data.y << endl; - } - usleep (100*1000); -} -cout << "finished waiting" << endl; -</body> - </ownedBehavior> - <ownedOperation xmi:id="_tyjRy8__Ed-TP80eVS-2Rg" name="activate" method="_tyjRwc__Ed-TP80eVS-2Rg"/> - <ownedOperation xmi:id="_tyjRzM__Ed-TP80eVS-2Rg" name="deactivate"/> - <ownedOperation xmi:id="_FJPu4CxyEeOMQpc6Y-MAJw" name="configuration_complete"/> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_LVgK4Sx0EeOWeqhsjwDAlw" name="interfaces"> - <packagedElement xmi:type="uml:DataType" xmi:id="_wFJ3IP91Ed6Jt8e-UqrRdQ" name="PubData"> - <ownedAttribute xmi:id="_yywF0P91Ed6Jt8e-UqrRdQ" name="y" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - <ownedAttribute xmi:id="_zUgvEP91Ed6Jt8e-UqrRdQ" name="x" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_LVlDYCx0EeOWeqhsjwDAlw" name="Producer"> - <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_jkNdADF8EeCpQdhNuFCtew _dNpvUBo4EeONpa5JgejICQ" name="Producer_impl"> - <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA"> - <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/> - </generalization> - <ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"/> - <interfaceRealization xmi:id="_jkNdADF8EeCpQdhNuFCtew" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - </interfaceRealization> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_dH4RIKF4Ed6FqJCjEUrkqQ"> - <language>C/C++</language> - <body>cout << "publish a value via port q;" << endl; -components::interfaces::PubData data; -data.x = 2; -data.y = 3; -for (int i = 0; i<20; i++) { - q->push (data); - cout << "." << flush; - // wait 200ms - usleep (200*1000); -} -</body> - </ownedBehavior> - <ownedOperation xmi:id="_dH4RIKF4Ed6FqJCjEUrkqQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/> - </packagedElement> - <packagedElement xmi:type="uml:Dependency" xmi:id="_dNpvUBo4EeONpa5JgejICQ" name="Dependency1" client="_IfjoETLbEd2qeKRLMdIx_A" supplier="_wFJ3IP91Ed6Jt8e-UqrRdQ"/> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_LVrxECx0EeOWeqhsjwDAlw" name="platform"> - <packagedElement xmi:type="uml:Package" xmi:id="_LVrxESx0EeOWeqhsjwDAlw" name="HWArchitecturePlatform"> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_GQ1ekKwHEeCQX8uv_p0Q4A" name="monoNode" classifier="_zY9vMDLiEd2RVeNawwNNzg"/> - </packagedElement> - <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_LV-sACx0EeOWeqhsjwDAlw" name="DataExchange_PubData"> - <templateBinding xmi:id="_LV-sASx0EeOWeqhsjwDAlw"> - <parameterSubstitution xmi:id="_LV-sAix0EeOWeqhsjwDAlw" actual="_wFJ3IP91Ed6Jt8e-UqrRdQ"> - <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://QML_CORE/fifo.uml#_diTcwHLoEd6R5tffIPrlPg"/> - </parameterSubstitution> - <signature href="pathmap://QML_CORE/fifo.uml#_cHY98HLoEd6R5tffIPrlPg"/> - </templateBinding> - <packagedElement xmi:type="uml:Package" xmi:id="_LV_6ICx0EeOWeqhsjwDAlw" name="FIFO"> - <packagedElement xmi:type="uml:Class" xmi:id="_Y1jF8HPpEd6R5tffIPrlPg" clientDependency="_y6XsAF72EeGerN33d-RdRg _LXnDsSx0EeOWeqhsjwDAlw _LXnDsix0EeOWeqhsjwDAlw" name="FIFO_impl"> - <generalization xmi:id="_Z4Oq8HPpEd6R5tffIPrlPg" general="_wh_EwHLmEd6R5tffIPrlPg"/> - <generalization xmi:id="_ws_1gF72EeGerN33d-RdRg"> - <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/> - </generalization> - <ownedAttribute xmi:id="_6iV9wHUHEd6R5tffIPrlPg" name="m_push_pos" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - <ownedAttribute xmi:id="_RlKZIHUIEd6R5tffIPrlPg" name="m_pull_pos" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - <ownedAttribute xmi:id="_XDRnoHUIEd6R5tffIPrlPg" name="m_size" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SUhOUBGcEd-rfYlCjUOxJQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SUpKIBGcEd-rfYlCjUOxJQ" value="1"/> - <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_T1yz0BGcEd-rfYlCjUOxJQ" value="20"/> - </ownedAttribute> - <ownedAttribute xmi:id="_XcO6MHUIEd6R5tffIPrlPg" name="m_filled" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - <ownedAttribute xmi:id="_zNeIsBGZEd-rfYlCjUOxJQ" name="m_fifo" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" isUnique="false" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q8o1YBGcEd-rfYlCjUOxJQ"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q8vjEBGcEd-rfYlCjUOxJQ" value="*"/> - </ownedAttribute> - <interfaceRealization xmi:id="_y6XsAF72EeGerN33d-RdRg" name="derived realization of ILifeCycle" client="_Y1jF8HPpEd6R5tffIPrlPg"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - </interfaceRealization> - <interfaceRealization xmi:id="_LXnDsSx0EeOWeqhsjwDAlw" name="derived realization of D_Push_PubData" client="_Y1jF8HPpEd6R5tffIPrlPg" supplier="_LXd5wSx0EeOWeqhsjwDAlw" contract="_LXd5wSx0EeOWeqhsjwDAlw"/> - <interfaceRealization xmi:id="_LXnDsix0EeOWeqhsjwDAlw" name="derived realization of D_PullConsumer_PubData" client="_Y1jF8HPpEd6R5tffIPrlPg" supplier="_LXjZUCx0EeOWeqhsjwDAlw" contract="_LXjZUCx0EeOWeqhsjwDAlw"/> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_FjGlgP69Ed6Zw96O-tCw7A" name="pull" specification="_EYx84P68Ed6Zw96O-tCw7A"> - <ownedParameter xmi:id="_LX9pACx0EeOWeqhsjwDAlw" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LX9pASx0EeOWeqhsjwDAlw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LX9pAix0EeOWeqhsjwDAlw" value="1"/> - </ownedParameter> - <language>C/C++</language> - <body>if (m_filled > 0) { - int current_pos = m_pull_pos; - - m_pull_pos ++; - m_filled --; - if (m_pull_pos == m_size) { - m_pull_pos = 0; - } - return m_fifo [current_pos]; -}</body> - </ownedBehavior> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_IwXLsP69Ed6Zw96O-tCw7A" name="push" specification="_EYsdUP68Ed6Zw96O-tCw7A"> - <ownedParameter xmi:id="_LX9pAyx0EeOWeqhsjwDAlw" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LX9pBCx0EeOWeqhsjwDAlw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LX9pBSx0EeOWeqhsjwDAlw" value="1"/> - </ownedParameter> - <language>C/C++</language> - <body>// copy passed parameters ... -if (m_filled < m_size) { - m_fifo [m_push_pos] = data; - m_push_pos ++; - m_filled ++; - if (m_push_pos == m_size) { - m_push_pos = 0; - } -}</body> - </ownedBehavior> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="__Ha0IBJHEd-XjYZ05V-9-Q" name="hasData" specification="_AnQ3QBI9Ed-XjYZ05V-9-Q"> - <ownedParameter xmi:id="_LX-QECx0EeOWeqhsjwDAlw" name="ret" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LX-QESx0EeOWeqhsjwDAlw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LX-QEix0EeOWeqhsjwDAlw" value="1"/> - </ownedParameter> - <language>C/C++</language> - <body>return (m_filled > 0);</body> - </ownedBehavior> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_QzOqwK8yEeCXIcykFPsB8Q" name="activate" specification="_5IpEwK8xEeCXIcykFPsB8Q"> - <language>C/C++</language> - <body> -if (m_size == 0) { - cerr << "Warning: size of FIFO is not properly configured (=0!)" << endl; -} -m_fifo = new ProducerConsumer::components::interfaces::PubData[m_size];</body> - </ownedBehavior> - <ownedOperation xmi:id="_EYx84P68Ed6Zw96O-tCw7A" name="pull" method="_FjGlgP69Ed6Zw96O-tCw7A"> - <ownedParameter xmi:id="_EYx84f68Ed6Zw96O-tCw7A" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EYx84v68Ed6Zw96O-tCw7A" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYx84_68Ed6Zw96O-tCw7A" value="1"/> - </ownedParameter> - </ownedOperation> - <ownedOperation xmi:id="_EYsdUP68Ed6Zw96O-tCw7A" name="push" method="_IwXLsP69Ed6Zw96O-tCw7A"> - <ownedParameter xmi:id="_EYtEYP68Ed6Zw96O-tCw7A" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EYtEYf68Ed6Zw96O-tCw7A" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYtEYv68Ed6Zw96O-tCw7A" value="1"/> - </ownedParameter> - </ownedOperation> - <ownedOperation xmi:id="_AnQ3QBI9Ed-XjYZ05V-9-Q" name="hasData" method="__Ha0IBJHEd-XjYZ05V-9-Q"> - <ownedParameter xmi:id="_AtKsIBJXEd-QgZm_R1AKbA" name="ret" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AtNIYBJXEd-QgZm_R1AKbA" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AtNvcBJXEd-QgZm_R1AKbA" value="1"/> - </ownedParameter> - </ownedOperation> - <ownedOperation xmi:id="_5IpEwK8xEeCXIcykFPsB8Q" name="activate" method="_QzOqwK8yEeCXIcykFPsB8Q"/> - <ownedOperation xmi:id="_y7cqEF72EeGerN33d-RdRg" name="deactivate"/> - <ownedOperation xmi:id="_LXo44Cx0EeOWeqhsjwDAlw" name="configuration_complete"/> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_wh_EwHLmEd6R5tffIPrlPg" name="PushPull" isAbstract="true"> - <generalization xmi:id="_6zGSwHLnEd6R5tffIPrlPg" general="_unqQoHLnEd6R5tffIPrlPg"/> - <generalization xmi:id="_9mPv0HLnEd6R5tffIPrlPg" general="_wtZ1IHLnEd6R5tffIPrlPg"/> - </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_unqQoHLnEd6R5tffIPrlPg" name="PushP" isAbstract="true"> - <ownedAttribute xmi:type="uml:Port" xmi:id="_xHb7MHLmEd6R5tffIPrlPg" name="pushP" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite" isConjugated="true"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SJlB4DFrEeCz5-DK9j5azg" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SLJvMDFrEeCz5-DK9j5azg" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_iRXR8P3IEeC1YdT2qA0bjA"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_wtZ1IHLnEd6R5tffIPrlPg" name="PullC" isAbstract="true"> - <ownedAttribute xmi:type="uml:Port" xmi:id="_xcu1wHLmEd6R5tffIPrlPg" name="pullC" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite" isConjugated="true"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VhIMgDFrEeCz5-DK9j5azg" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ViKuUDFrEeCz5-DK9j5azg" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_2az3IC_fEeKl_vDGXh-OPw"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_LXdSsCx0EeOWeqhsjwDAlw" name="derivedInterfaces"> - <packagedElement xmi:type="uml:Package" xmi:id="_LXdSsSx0EeOWeqhsjwDAlw" name="ProducerConsumer"> - <packagedElement xmi:type="uml:Package" xmi:id="_LXdSsix0EeOWeqhsjwDAlw" name="components"> - <packagedElement xmi:type="uml:Package" xmi:id="_LXd5wCx0EeOWeqhsjwDAlw" name="interfaces"> - <packagedElement xmi:type="uml:Interface" xmi:id="_LXd5wSx0EeOWeqhsjwDAlw" name="D_Push_PubData"> - <ownedOperation xmi:id="_LXiyQSx0EeOWeqhsjwDAlw" name="push"> - <ownedParameter xmi:id="_LXiyQix0EeOWeqhsjwDAlw" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ"/> - </ownedOperation> - </packagedElement> - <packagedElement xmi:type="uml:Interface" xmi:id="_LXjZUCx0EeOWeqhsjwDAlw" name="D_PullConsumer_PubData"> - <ownedOperation xmi:id="_LXmcoSx0EeOWeqhsjwDAlw" name="pull"> - <ownedParameter xmi:id="_LXmcoix0EeOWeqhsjwDAlw" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return"/> - </ownedOperation> - <ownedOperation xmi:id="_LXmcoyx0EeOWeqhsjwDAlw" name="hasData"> - <ownedParameter xmi:id="_LXnDsCx0EeOWeqhsjwDAlw" name="ret" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/> - </ownedParameter> - </ownedOperation> - </packagedElement> - </packagedElement> - </packagedElement> - </packagedElement> - </packagedElement> - <profileApplication xmi:id="_LVZdMCx0EeOWeqhsjwDAlw"> - <eAnnotations xmi:id="_LVZdMSx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/> - </eAnnotations> - <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/> - </profileApplication> - <profileApplication xmi:id="_LVZdMix0EeOWeqhsjwDAlw"> - <eAnnotations xmi:id="_LVZdMyx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> - </eAnnotations> - <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> - </profileApplication> - <profileApplication xmi:id="_LVaEQCx0EeOWeqhsjwDAlw"> - <eAnnotations xmi:id="_LVaEQSx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> - </eAnnotations> - <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> - </profileApplication> - <profileApplication xmi:id="_LVaEQix0EeOWeqhsjwDAlw"> - <eAnnotations xmi:id="_LVaEQyx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_LVarUCx0EeOWeqhsjwDAlw"> - <eAnnotations xmi:id="_LVbSYCx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_LVb5cCx0EeOWeqhsjwDAlw"> - <eAnnotations xmi:id="_LVb5cSx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - </uml:Model> - <Alloc:Allocate xmi:id="_LVeVsSx0EeOWeqhsjwDAlw" base_Abstraction="_9dY5YBSqEeOUifYpcO0mcw"/> - <C_Cpp:Include xmi:id="_11OtwPcaEd-KM6l7lmIPkw" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_tyiqsc__Ed-TP80eVS-2Rg"/> - <GCM:FlowPort xmi:id="_LVgx8Cx0EeOWeqhsjwDAlw" direction="in" base_Port="_tyiqs8__Ed-TP80eVS-2Rg"/> - <FCM:Port xmi:id="_LVgx8Sx0EeOWeqhsjwDAlw" base_Port="_tyiqs8__Ed-TP80eVS-2Rg"> - <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:DerivedElement xmi:id="_LVhZASx0EeOWeqhsjwDAlw" base_Element="_tyjRy8__Ed-TP80eVS-2Rg"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_LViAESx0EeOWeqhsjwDAlw" base_Element="_tyjRzM__Ed-TP80eVS-2Rg"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_LVinISx0EeOWeqhsjwDAlw" base_Element="_FJPu4CxyEeOMQpc6Y-MAJw"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_ns4qsClUEeO4bs_nkcnKOg"/> - </FCM:DerivedElement> - <Alloc:Allocate xmi:id="_LVkcUyx0EeOWeqhsjwDAlw" base_Abstraction="_--_2EBSqEeOUifYpcO0mcw"/> - <C_Cpp:Include xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> - <FCM:Port xmi:id="_LVm4kCx0EeOWeqhsjwDAlw" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"> - <kind href="pathmap://QML_CORE/core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/> - </FCM:Port> - <GCM:FlowPort xmi:id="_LVm4kSx0EeOWeqhsjwDAlw" direction="out" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"/> - <FCM:DerivedElement xmi:id="_LVoGsCx0EeOWeqhsjwDAlw" base_Element="_dH4RIKF4Ed6FqJCjEUrkqQ"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> - </FCM:DerivedElement> - <FCM:Target xmi:id="_LVtmQCx0EeOWeqhsjwDAlw" base_Node="_zY9vMDLiEd2RVeNawwNNzg"> - <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> - <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> - </FCM:Target> - <Alloc:Allocate xmi:id="_LV0T8Cx0EeOWeqhsjwDAlw" base_Abstraction="_LVuNUCx0EeOWeqhsjwDAlw"/> - <FCM:InteractionComponent xmi:id="_xQ_ccHUuEd6R5tffIPrlPg" base_Class="_Y1jF8HPpEd6R5tffIPrlPg"/> - <C_Cpp:Include xmi:id="_fUHyQF8DEeGerN33d-RdRg" body="#include <iostream>
using namespace std;" base_class="_Y1jF8HPpEd6R5tffIPrlPg"/> - <FCM:InteractionComponent xmi:id="_IwT2cP6_Ed6Zw96O-tCw7A" base_Class="_wh_EwHLmEd6R5tffIPrlPg"/> - <FCM:Port xmi:id="_42zlMHLnEd6R5tffIPrlPg" base_Port="_xHb7MHLmEd6R5tffIPrlPg"> - <kind href="pathmap://QML_CORE/core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:Port xmi:id="_57KlMHLnEd6R5tffIPrlPg" base_Port="_xcu1wHLmEd6R5tffIPrlPg"> - <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:ConfigurationProperty xmi:id="_FxN9cLC0EeCaaIdtw75MLg" base_Property="_XDRnoHUIEd6R5tffIPrlPg"/> - <FCM:DerivedElement xmi:id="_EYzyEP68Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A" source="_LXmcoSx0EeOWeqhsjwDAlw"/> - <FCM:DerivedElement xmi:id="_0TVb8P6-Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_7HAIIP6-Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_vfETEARNEd-OidZzGKCpzg" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_op6Y4AnOEd-9beZpMGts2w" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_6tSQAAnUEd-co_m_wv4b6A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_YMw7cBGZEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_t04d8BGaEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_G7QQABGcEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_C5J9cBGlEd-Jq_XWT8Mhpg" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_IAxtYBI7Ed-3zOZ0RGapGA" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_AnPpIBI9Ed-XjYZ05V-9-Q" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_11WOABJWEd-QgZm_R1AKbA" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_C7WOoBQ-Ed-_dI0JopJMvQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_kUNw0Bb8Ed-u0pMEAnvpEQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_6-1mQBcKEd-Tda7vKXmT2A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_EYu5kP68Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A" source="_LXiyQSx0EeOWeqhsjwDAlw"/> - <FCM:DerivedElement xmi:id="_0TRKgP6-Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_7G9E0P6-Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_vfBPwARNEd-OidZzGKCpzg" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_op38oAnOEd-9beZpMGts2w" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_6tRB4AnUEd-co_m_wv4b6A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_YMvtUBGZEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_t02owBGaEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_G7PB4BGcEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_C4zYIBGlEd-Jq_XWT8Mhpg" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_IAwfQBI7Ed-3zOZ0RGapGA" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_AnNM4BI9Ed-XjYZ05V-9-Q" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_11TxwBJWEd-QgZm_R1AKbA" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_C7UZcBQ-Ed-_dI0JopJMvQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_kUMisBb8Ed-u0pMEAnvpEQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_6-zKABcKEd-Tda7vKXmT2A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_AnVvwBI9Ed-XjYZ05V-9-Q" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q" source="_LXmcoyx0EeOWeqhsjwDAlw"/> - <FCM:DerivedElement xmi:id="_11YqQBJWEd-QgZm_R1AKbA" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q"/> - <FCM:DerivedElement xmi:id="_C7YD0BQ-Ed-_dI0JopJMvQ" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q"/> - <FCM:DerivedElement xmi:id="_kUPmABb8Ed-u0pMEAnvpEQ" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q"/> - <FCM:DerivedElement xmi:id="_6-3bcBcKEd-Tda7vKXmT2A" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q"/> - <FCM:Template xmi:id="_LXDDACx0EeOWeqhsjwDAlw" base_Element="_5IpEwK8xEeCXIcykFPsB8Q"/> - <FCM:DerivedElement xmi:id="_LXDDASx0EeOWeqhsjwDAlw" base_Element="_5IpEwK8xEeCXIcykFPsB8Q"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_LXbdgCx0EeOWeqhsjwDAlw" base_Element="_y7cqEF72EeGerN33d-RdRg"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_LXiyQCx0EeOWeqhsjwDAlw" base_Element="_LXd5wSx0EeOWeqhsjwDAlw" source="_wFJ3IP91Ed6Jt8e-UqrRdQ"/> - <FCM:DerivedElement xmi:id="_LXmcoCx0EeOWeqhsjwDAlw" base_Element="_LXjZUCx0EeOWeqhsjwDAlw" source="_wFJ3IP91Ed6Jt8e-UqrRdQ"/> - <FCM:DerivedElement xmi:id="_LXsjQCx0EeOWeqhsjwDAlw" base_Element="_LXo44Cx0EeOWeqhsjwDAlw"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_ns4qsClUEeO4bs_nkcnKOg"/> - </FCM:DerivedElement> - <FCM:DeploymentPlan xmi:id="_LVcggix0EeOWeqhsjwDAlw" base_Package="_LVdHkSx0EeOWeqhsjwDAlw"/> -</xmi:XMI> diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerTwoConsumersTmp.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerTwoConsumersTmp.uml deleted file mode 100644 index 374740863d7..00000000000 --- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerTwoConsumersTmp.uml +++ /dev/null @@ -1,567 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:GCM="http://www.eclipse.org/papyrus/GCM/1" 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/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc http://www.eclipse.org/papyrus/GCM/1 http://www.eclipse.org/papyrus/MARTE/1#//GCM"> - <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ProducerTwoConsumers"> - <packageImport xmi:id="_oDu70ixyEeOMQpc6Y-MAJw"> - <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> - </packageImport> - <packageImport xmi:id="_oDu70yxyEeOMQpc6Y-MAJw"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/> - </packageImport> - <packageImport xmi:id="_oDu71CxyEeOMQpc6Y-MAJw"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/> - </packageImport> - <packageImport xmi:id="_oDu71SxyEeOMQpc6Y-MAJw"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/fifo.uml#_ePwqkHLmEd6R5tffIPrlPg"/> - </packageImport> - <packageImport xmi:id="_oDvi4CxyEeOMQpc6Y-MAJw"> - <importedPackage xmi:type="uml:Model" href="pathmap://QML_TRACE/tracing.uml#_H-ZqYDKeEd-WprEKTCaiMA"/> - </packageImport> - <packagedElement xmi:type="uml:Package" xmi:id="_oDvi4SxyEeOMQpc6Y-MAJw" name="globalenums"/> - <packagedElement xmi:type="uml:Package" xmi:id="_oDwJ8CxyEeOMQpc6Y-MAJw" name="deployment"> - <packagedElement xmi:type="uml:Package" xmi:id="_oDwJ8SxyEeOMQpc6Y-MAJw" name="monoPull"> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oDwJ8ixyEeOMQpc6Y-MAJw" clientDependency="_oD7wICxyEeOMQpc6Y-MAJw" name="mainInstance" classifier="_bYJagDLiEd2RVeNawwNNzg"> - <slot xmi:id="_oEd7oixyEeOMQpc6Y-MAJw" definingFeature="_gV1cgDLiEd2RVeNawwNNzg"> - <value xmi:type="uml:InstanceValue" xmi:id="_oEd7oyxyEeOMQpc6Y-MAJw" instance="_oEV_0ixyEeOMQpc6Y-MAJw"/> - </slot> - <slot xmi:id="_oEeisCxyEeOMQpc6Y-MAJw" definingFeature="_i-I7gDLiEd2RVeNawwNNzg"> - <value xmi:type="uml:InstanceValue" xmi:id="_oEeisSxyEeOMQpc6Y-MAJw" instance="_oEd7pCxyEeOMQpc6Y-MAJw"/> - </slot> - <slot xmi:id="_oEfJxSxyEeOMQpc6Y-MAJw" definingFeature="_-uMo0FuoEeGjjMeADLT5-g"> - <value xmi:type="uml:InstanceValue" xmi:id="_oEfJxixyEeOMQpc6Y-MAJw" instance="_oEfJwCxyEeOMQpc6Y-MAJw"/> - </slot> - <slot xmi:id="_oFt40yxyEeOMQpc6Y-MAJw" definingFeature="_EM2p4FupEeGjjMeADLT5-g"> - <value xmi:type="uml:InstanceValue" xmi:id="_oFt41CxyEeOMQpc6Y-MAJw" instance="_oFt40CxyEeOMQpc6Y-MAJw"/> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:Abstraction" xmi:id="_oD7wICxyEeOMQpc6Y-MAJw" name="allocate mainInstance to monoNode" client="_oDwJ8ixyEeOMQpc6Y-MAJw" supplier="_GQ1ekKwHEeCQX8uv_p0Q4A"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEABkCxyEeOMQpc6Y-MAJw" name="mainInstance.cons1._executor" classifier="_tyiqsc__Ed-TP80eVS-2Rg"> - <slot xmi:id="_oEd7oCxyEeOMQpc6Y-MAJw" definingFeature="_kLNdAF8DEeGerN33d-RdRg"> - <value xmi:type="uml:LiteralString" xmi:id="_oEd7oSxyEeOMQpc6Y-MAJw" name="value for name" value=""cons1""> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> - </value> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEV_0ixyEeOMQpc6Y-MAJw" name="mainInstance.cons1" classifier="_cc_tyiqsc__Ed-TP80eVS-2Rg"> - <slot xmi:id="_oEV_0yxyEeOMQpc6Y-MAJw" definingFeature="e_tyiqsc__Ed-TP80eVS-2Rg"> - <value xmi:type="uml:InstanceValue" xmi:id="_oEV_1CxyEeOMQpc6Y-MAJw" instance="_oEABkCxyEeOMQpc6Y-MAJw"/> - </slot> - <slot xmi:id="_oEdUkSxyEeOMQpc6Y-MAJw" definingFeature="p_cc_tyiqsc__Ed-TP80eVS-2Rg1"> - <value xmi:type="uml:InstanceValue" xmi:id="_oEdUkixyEeOMQpc6Y-MAJw" instance="_oEdUkCxyEeOMQpc6Y-MAJw"/> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEdUkCxyEeOMQpc6Y-MAJw" name="mainInstance.cons1.intercept lc0"> - <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_5J9coCXQEeGX6PuSE-DJlQ"/> - <slot xmi:id="_oEdUkyxyEeOMQpc6Y-MAJw"> - <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE//core.uml#_rVfYoMGJEd-Mveea1W_olA"/> - <value xmi:type="uml:LiteralInteger" xmi:id="_oEdUlCxyEeOMQpc6Y-MAJw" name="value for priority"> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> - </value> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEd7pCxyEeOMQpc6Y-MAJw" name="mainInstance.pub" classifier="_IfjoETLbEd2qeKRLMdIx_A"/> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEeisixyEeOMQpc6Y-MAJw" name="mainInstance.cons2._executor" classifier="_tyiqsc__Ed-TP80eVS-2Rg"> - <slot xmi:id="_oEfJwyxyEeOMQpc6Y-MAJw" definingFeature="_kLNdAF8DEeGerN33d-RdRg"> - <value xmi:type="uml:LiteralString" xmi:id="_oEfJxCxyEeOMQpc6Y-MAJw" name="value for name" value=""cons2""> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> - </value> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEfJwCxyEeOMQpc6Y-MAJw" name="mainInstance.cons2" classifier="_cc_tyiqsc__Ed-TP80eVS-2Rg"> - <slot xmi:id="_oEfJwSxyEeOMQpc6Y-MAJw" definingFeature="e_tyiqsc__Ed-TP80eVS-2Rg"> - <value xmi:type="uml:InstanceValue" xmi:id="_oEfJwixyEeOMQpc6Y-MAJw" instance="_oEeisixyEeOMQpc6Y-MAJw"/> - </slot> - </packagedElement> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oFt40CxyEeOMQpc6Y-MAJw" name="mainInstance.fifo" classifier="_Y1jF8HPpEd6R5tffIPrlPg"> - <slot xmi:id="_oFt40SxyEeOMQpc6Y-MAJw"> - <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/fifo.uml#_XDRnoHUIEd6R5tffIPrlPg"/> - <value xmi:type="uml:LiteralInteger" xmi:id="_oFt40ixyEeOMQpc6Y-MAJw" name="value for m_size" value="30"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </value> - </slot> - </packagedElement> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_oDwJ8yxyEeOMQpc6Y-MAJw" name="components"> - <packagedElement xmi:type="uml:Package" xmi:id="_oDwJ9CxyEeOMQpc6Y-MAJw" name="System"> - <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="SystemPull_impl"> - <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="cons1" visibility="public" type="_cc_tyiqsc__Ed-TP80eVS-2Rg" isUnique="false" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Wn23gFunEeGjjMeADLT5-g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WoGIEFunEeGjjMeADLT5-g" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_WoP5EFunEeGjjMeADLT5-g"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="pub" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/> - <ownedAttribute xmi:id="_-uMo0FuoEeGjjMeADLT5-g" name="cons2" visibility="public" type="_cc_tyiqsc__Ed-TP80eVS-2Rg" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kWRdYFupEeGjjMeADLT5-g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kWT5oFupEeGjjMeADLT5-g" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_kXMDYFupEeGjjMeADLT5-g"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <ownedAttribute xmi:id="_EM2p4FupEeGjjMeADLT5-g" name="fifo" visibility="public" type="_Y1jF8HPpEd6R5tffIPrlPg" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IzF1MFupEeGjjMeADLT5-g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IzHDUFupEeGjjMeADLT5-g" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_IzI4gFupEeGjjMeADLT5-g"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - <ownedConnector xmi:id="_efVI0E2rEeGl8qrc8BM7vA" name="push"> - <end xmi:id="_efVv4E2rEeGl8qrc8BM7vA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_efVv4k2rEeGl8qrc8BM7vA" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_efVv4U2rEeGl8qrc8BM7vA" value="1"/> - </end> - <end xmi:id="_efWW8E2rEeGl8qrc8BM7vA" partWithPort="_EM2p4FupEeGjjMeADLT5-g" role="_xHb7MHLmEd6R5tffIPrlPg"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_efWW8k2rEeGl8qrc8BM7vA" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_efWW8U2rEeGl8qrc8BM7vA" value="1"/> - </end> - </ownedConnector> - <ownedConnector xmi:id="_XmCsIFupEeGjjMeADLT5-g" name="pull1"> - <end xmi:id="_XmDTMFupEeGjjMeADLT5-g" partWithPort="_EM2p4FupEeGjjMeADLT5-g" role="_xcu1wHLmEd6R5tffIPrlPg"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XmDTMlupEeGjjMeADLT5-g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XmDTMVupEeGjjMeADLT5-g" value="1"/> - </end> - <end xmi:id="_XmD6QFupEeGjjMeADLT5-g" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_tyiqs8__Ed-TP80eVS-2Rg"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XmD6QlupEeGjjMeADLT5-g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XmD6QVupEeGjjMeADLT5-g" value="1"/> - </end> - </ownedConnector> - <ownedConnector xmi:id="_YTirUFupEeGjjMeADLT5-g" name="pull2"> - <end xmi:id="_YTjSYFupEeGjjMeADLT5-g" partWithPort="_EM2p4FupEeGjjMeADLT5-g" role="_xcu1wHLmEd6R5tffIPrlPg"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YTjSYlupEeGjjMeADLT5-g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YTjSYVupEeGjjMeADLT5-g" value="1"/> - </end> - <end xmi:id="_YTjSY1upEeGjjMeADLT5-g" partWithPort="_-uMo0FuoEeGjjMeADLT5-g" role="_tyiqs8__Ed-TP80eVS-2Rg"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YTjSZVupEeGjjMeADLT5-g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YTjSZFupEeGjjMeADLT5-g" value="1"/> - </end> - </ownedConnector> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_oDwxACxyEeOMQpc6Y-MAJw" name="PullConsumer"> - <packagedElement xmi:type="uml:Class" xmi:id="_tyiqsc__Ed-TP80eVS-2Rg" clientDependency="_DHTiQDF7EeCpQdhNuFCtew" name="PullConsumer_impl"> - <generalization xmi:id="_tyiqss__Ed-TP80eVS-2Rg"> - <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/> - </generalization> - <ownedAttribute xmi:type="uml:Port" xmi:id="_tyiqs8__Ed-TP80eVS-2Rg" name="p" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"/> - <ownedAttribute xmi:id="_kLNdAF8DEeGerN33d-RdRg" name="name"> - <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kLSVgF8DEeGerN33d-RdRg" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kLS8kF8DEeGerN33d-RdRg" value="1"/> - </ownedAttribute> - <interfaceRealization xmi:id="_DHTiQDF7EeCpQdhNuFCtew" name="derived realization of ILifeCycle" client="_tyiqsc__Ed-TP80eVS-2Rg"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - </interfaceRealization> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_tyjRwc__Ed-TP80eVS-2Rg" name="activate" specification="_tyjRy8__Ed-TP80eVS-2Rg"> - <language>C/C++</language> - <body>cout << "wait for data on port p" << endl; -for (int i = 0; i<25; i++) { - if (p->hasData ()) { - components::interfaces::PubData data = p->pull (); - cout << "Componenent " << name << " received data: x = " << data.x << " y = " << data.y << endl; - } - usleep (100*1000); -} -cout << "finished waiting" << endl; -</body> - </ownedBehavior> - <ownedOperation xmi:id="_tyjRy8__Ed-TP80eVS-2Rg" name="activate" method="_tyjRwc__Ed-TP80eVS-2Rg"/> - <ownedOperation xmi:id="_tyjRzM__Ed-TP80eVS-2Rg" name="deactivate"/> - </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_cc_tyiqsc__Ed-TP80eVS-2Rg" name="PullConsumer_impl_cc"> - <ownedAttribute xmi:id="e_tyiqsc__Ed-TP80eVS-2Rg" name="_executor" type="_tyiqsc__Ed-TP80eVS-2Rg" aggregation="composite"/> - <ownedAttribute xmi:type="uml:Port" xmi:id="_oEAooCxyEeOMQpc6Y-MAJw" name="p" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"/> - <ownedAttribute xmi:type="uml:Port" xmi:id="_oENc8SxyEeOMQpc6Y-MAJw" name="lc" aggregation="composite"> - <type xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oENc8ixyEeOMQpc6Y-MAJw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oENc8yxyEeOMQpc6Y-MAJw" value="1"/> - </ownedAttribute> - <ownedAttribute xmi:id="p_cc_tyiqsc__Ed-TP80eVS-2Rg1" name="intercept_lc0" aggregation="composite"> - <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_5J9coCXQEeGX6PuSE-DJlQ"/> - </ownedAttribute> - <ownedConnector xmi:id="_cc_tyiqsc__Ed-TP80eVS-2Rg0" name="delegation p"> - <end xmi:id="_oEM14SxyEeOMQpc6Y-MAJw" role="_oEAooCxyEeOMQpc6Y-MAJw"/> - <end xmi:id="_oENc8CxyEeOMQpc6Y-MAJw" partWithPort="e_tyiqsc__Ed-TP80eVS-2Rg" role="_tyiqs8__Ed-TP80eVS-2Rg"/> - </ownedConnector> - <ownedConnector xmi:id="_cc_tyiqsc__Ed-TP80eVS-2Rg10" name="c intercept_lc0 0"> - <end xmi:id="_oEcGcixyEeOMQpc6Y-MAJw" role="_oENc8SxyEeOMQpc6Y-MAJw"/> - <end xmi:id="_oEcGcyxyEeOMQpc6Y-MAJw" partWithPort="p_cc_tyiqsc__Ed-TP80eVS-2Rg1"> - <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/> - </end> - </ownedConnector> - <ownedConnector xmi:id="_cc_tyiqsc__Ed-TP80eVS-2Rg11" name="c intercept_lc0 1"> - <end xmi:id="_oEctgSxyEeOMQpc6Y-MAJw" partWithPort="e_tyiqsc__Ed-TP80eVS-2Rg"> - <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/> - </end> - <end xmi:id="_oEctgixyEeOMQpc6Y-MAJw" partWithPort="p_cc_tyiqsc__Ed-TP80eVS-2Rg1"> - <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/> - </end> - </ownedConnector> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_oDx_ISxyEeOMQpc6Y-MAJw" name="interfaces"> - <packagedElement xmi:type="uml:DataType" xmi:id="_wFJ3IP91Ed6Jt8e-UqrRdQ" name="PubData"> - <ownedAttribute xmi:id="_yywF0P91Ed6Jt8e-UqrRdQ" name="y" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - <ownedAttribute xmi:id="_zUgvEP91Ed6Jt8e-UqrRdQ" name="x" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_oD1CcCxyEeOMQpc6Y-MAJw" name="Producer"> - <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_jkNdADF8EeCpQdhNuFCtew" name="Producer_impl"> - <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA"> - <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/> - </generalization> - <ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zDR50FuoEeGjjMeADLT5-g" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zDTH8FuoEeGjjMeADLT5-g" value="1"/> - </ownedAttribute> - <interfaceRealization xmi:id="_jkNdADF8EeCpQdhNuFCtew" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> - </interfaceRealization> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_dH4RIKF4Ed6FqJCjEUrkqQ"> - <language>C/C++</language> - <body>cout << "publish a value via port q;" << endl; -components::interfaces::PubData data; -data.x = 2; -data.y = 3; -for (int i = 0; i<20; i++) { - q->push (data); - cout << "." << flush; - // wait 200ms - usleep (200*1000); -} -</body> - </ownedBehavior> - <ownedOperation xmi:id="_dH4RIKF4Ed6FqJCjEUrkqQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/> - </packagedElement> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_oD6iACxyEeOMQpc6Y-MAJw" name="platform"> - <packagedElement xmi:type="uml:Package" xmi:id="_oD6iASxyEeOMQpc6Y-MAJw" name="HWArchitecturePlatform"> - <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_GQ1ekKwHEeCQX8uv_p0Q4A" name="monoNode" classifier="_zY9vMDLiEd2RVeNawwNNzg"/> - </packagedElement> - <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_oEg-8CxyEeOMQpc6Y-MAJw" name="DataExchange_PubData"> - <templateBinding xmi:id="_oEg-8SxyEeOMQpc6Y-MAJw"> - <parameterSubstitution xmi:id="_oEg-8ixyEeOMQpc6Y-MAJw" actual="_wFJ3IP91Ed6Jt8e-UqrRdQ"> - <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://QML_CORE/fifo.uml#_diTcwHLoEd6R5tffIPrlPg"/> - </parameterSubstitution> - <signature href="pathmap://QML_CORE/fifo.uml#_cHY98HLoEd6R5tffIPrlPg"/> - </templateBinding> - <packagedElement xmi:type="uml:Package" xmi:id="_oEg-8yxyEeOMQpc6Y-MAJw" name="FIFO"> - <packagedElement xmi:type="uml:Class" xmi:id="_Y1jF8HPpEd6R5tffIPrlPg" clientDependency="_y6XsAF72EeGerN33d-RdRg _oFWscCxyEeOMQpc6Y-MAJw _oFWscSxyEeOMQpc6Y-MAJw" name="FIFO_impl"> - <generalization xmi:id="_Z4Oq8HPpEd6R5tffIPrlPg" general="_wh_EwHLmEd6R5tffIPrlPg"/> - <generalization xmi:id="_ws_1gF72EeGerN33d-RdRg"> - <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/> - </generalization> - <ownedAttribute xmi:id="_6iV9wHUHEd6R5tffIPrlPg" name="m_push_pos" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - <ownedAttribute xmi:id="_RlKZIHUIEd6R5tffIPrlPg" name="m_pull_pos" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - <ownedAttribute xmi:id="_XDRnoHUIEd6R5tffIPrlPg" name="m_size" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SUhOUBGcEd-rfYlCjUOxJQ" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SUpKIBGcEd-rfYlCjUOxJQ" value="1"/> - <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_T1yz0BGcEd-rfYlCjUOxJQ" value="20"/> - </ownedAttribute> - <ownedAttribute xmi:id="_XcO6MHUIEd6R5tffIPrlPg" name="m_filled" isUnique="false" aggregation="composite"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> - </ownedAttribute> - <ownedAttribute xmi:id="_zNeIsBGZEd-rfYlCjUOxJQ" name="m_fifo" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" isUnique="false" aggregation="composite"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q8o1YBGcEd-rfYlCjUOxJQ"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q8vjEBGcEd-rfYlCjUOxJQ" value="*"/> - </ownedAttribute> - <interfaceRealization xmi:id="_y6XsAF72EeGerN33d-RdRg" name="derived realization of ILifeCycle" client="_Y1jF8HPpEd6R5tffIPrlPg"> - <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/> - </interfaceRealization> - <interfaceRealization xmi:id="_oFWscCxyEeOMQpc6Y-MAJw" name="derived realization of D_Push_PubData" client="_Y1jF8HPpEd6R5tffIPrlPg" supplier="_oFMUZCxyEeOMQpc6Y-MAJw" contract="_oFMUZCxyEeOMQpc6Y-MAJw"/> - <interfaceRealization xmi:id="_oFWscSxyEeOMQpc6Y-MAJw" name="derived realization of D_PullConsumer_PubData" client="_Y1jF8HPpEd6R5tffIPrlPg" supplier="_oFQl0yxyEeOMQpc6Y-MAJw" contract="_oFQl0yxyEeOMQpc6Y-MAJw"/> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_FjGlgP69Ed6Zw96O-tCw7A" name="pull" specification="_EYx84P68Ed6Zw96O-tCw7A"> - <ownedParameter xmi:id="_oFq1gCxyEeOMQpc6Y-MAJw" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oFq1gSxyEeOMQpc6Y-MAJw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oFq1gixyEeOMQpc6Y-MAJw" value="1"/> - </ownedParameter> - <language>C/C++</language> - <body>if (m_filled > 0) { - int current_pos = m_pull_pos; - - m_pull_pos ++; - m_filled --; - if (m_pull_pos == m_size) { - m_pull_pos = 0; - } - return m_fifo [current_pos]; -}</body> - </ownedBehavior> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_IwXLsP69Ed6Zw96O-tCw7A" name="push" specification="_EYsdUP68Ed6Zw96O-tCw7A"> - <ownedParameter xmi:id="_oFq1gyxyEeOMQpc6Y-MAJw" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oFq1hCxyEeOMQpc6Y-MAJw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oFq1hSxyEeOMQpc6Y-MAJw" value="1"/> - </ownedParameter> - <language>C/C++</language> - <body>// copy passed parameters ... -if (m_filled < m_size) { - m_fifo [m_push_pos] = data; - m_push_pos ++; - m_filled ++; - if (m_push_pos == m_size) { - m_push_pos = 0; - } -}</body> - </ownedBehavior> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="__Ha0IBJHEd-XjYZ05V-9-Q" name="hasData"> - <ownedParameter xmi:id="_oFq1hixyEeOMQpc6Y-MAJw" name="ret" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oFrckCxyEeOMQpc6Y-MAJw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oFrckSxyEeOMQpc6Y-MAJw" value="1"/> - </ownedParameter> - <language>C/C++</language> - <body>return (m_filled > 0);</body> - </ownedBehavior> - <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_QzOqwK8yEeCXIcykFPsB8Q" name="activate" specification="_5IpEwK8xEeCXIcykFPsB8Q"> - <language>C/C++</language> - <body> -if (m_size == 0) { - cerr << "Warning: size of FIFO is not properly configured (=0!)" << endl; -} -m_fifo = new ProducerTwoConsumers::components::interfaces::PubData[m_size];</body> - </ownedBehavior> - <ownedOperation xmi:id="_EYx84P68Ed6Zw96O-tCw7A" name="pull" method="_FjGlgP69Ed6Zw96O-tCw7A"> - <ownedParameter xmi:id="_EYx84f68Ed6Zw96O-tCw7A" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EYx84v68Ed6Zw96O-tCw7A" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYx84_68Ed6Zw96O-tCw7A" value="1"/> - </ownedParameter> - </ownedOperation> - <ownedOperation xmi:id="_EYsdUP68Ed6Zw96O-tCw7A" name="push" method="_IwXLsP69Ed6Zw96O-tCw7A"> - <ownedParameter xmi:id="_EYtEYP68Ed6Zw96O-tCw7A" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EYtEYf68Ed6Zw96O-tCw7A" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYtEYv68Ed6Zw96O-tCw7A" value="1"/> - </ownedParameter> - </ownedOperation> - <ownedOperation xmi:id="_5IpEwK8xEeCXIcykFPsB8Q" name="activate" method="_QzOqwK8yEeCXIcykFPsB8Q"/> - <ownedOperation xmi:id="_y7cqEF72EeGerN33d-RdRg" name="deactivate"/> - <ownedOperation xmi:id="_oFX6kCxyEeOMQpc6Y-MAJw" name="configuration_complete"/> - <ownedOperation xmi:id="_oFmkECxyEeOMQpc6Y-MAJw" name="data"> - <ownedParameter xmi:id="_oFmkESxyEeOMQpc6Y-MAJw" name="ret" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oFmkEixyEeOMQpc6Y-MAJw" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oFnLICxyEeOMQpc6Y-MAJw" value="1"/> - </ownedParameter> - </ownedOperation> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_wh_EwHLmEd6R5tffIPrlPg" name="PushPull" isAbstract="true"> - <generalization xmi:id="_6zGSwHLnEd6R5tffIPrlPg" general="_unqQoHLnEd6R5tffIPrlPg"/> - <generalization xmi:id="_9mPv0HLnEd6R5tffIPrlPg" general="_wtZ1IHLnEd6R5tffIPrlPg"/> - </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_unqQoHLnEd6R5tffIPrlPg" name="PushP" isAbstract="true"> - <ownedAttribute xmi:type="uml:Port" xmi:id="_xHb7MHLmEd6R5tffIPrlPg" name="pushP" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite" isConjugated="true"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SJlB4DFrEeCz5-DK9j5azg" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SLJvMDFrEeCz5-DK9j5azg" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_iRXR8P3IEeC1YdT2qA0bjA"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - </packagedElement> - <packagedElement xmi:type="uml:Class" xmi:id="_wtZ1IHLnEd6R5tffIPrlPg" name="PullC" isAbstract="true"> - <ownedAttribute xmi:type="uml:Port" xmi:id="_xcu1wHLmEd6R5tffIPrlPg" name="pullC" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite" isConjugated="true"> - <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VhIMgDFrEeCz5-DK9j5azg" value="1"/> - <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ViKuUDFrEeCz5-DK9j5azg" value="1"/> - <defaultValue xmi:type="uml:LiteralString" xmi:id="_2az3IC_fEeKl_vDGXh-OPw"> - <value xsi:nil="true"/> - </defaultValue> - </ownedAttribute> - </packagedElement> - </packagedElement> - <packagedElement xmi:type="uml:Package" xmi:id="_oFMUYCxyEeOMQpc6Y-MAJw" name="derivedInterfaces"> - <packagedElement xmi:type="uml:Package" xmi:id="_oFMUYSxyEeOMQpc6Y-MAJw" name="ProducerTwoConsumers"> - <packagedElement xmi:type="uml:Package" xmi:id="_oFMUYixyEeOMQpc6Y-MAJw" name="components"> - <packagedElement xmi:type="uml:Package" xmi:id="_oFMUYyxyEeOMQpc6Y-MAJw" name="interfaces"> - <packagedElement xmi:type="uml:Interface" xmi:id="_oFMUZCxyEeOMQpc6Y-MAJw" name="D_Push_PubData"> - <ownedOperation xmi:id="_oFQl0SxyEeOMQpc6Y-MAJw" name="push"> - <ownedParameter xmi:id="_oFQl0ixyEeOMQpc6Y-MAJw" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ"/> - </ownedOperation> - </packagedElement> - <packagedElement xmi:type="uml:Interface" xmi:id="_oFQl0yxyEeOMQpc6Y-MAJw" name="D_PullConsumer_PubData"> - <ownedOperation xmi:id="_oFVeUSxyEeOMQpc6Y-MAJw" name="pull"> - <ownedParameter xmi:id="_oFVeUixyEeOMQpc6Y-MAJw" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return"/> - </ownedOperation> - <ownedOperation xmi:id="_oFWFYCxyEeOMQpc6Y-MAJw" name="data"> - <ownedParameter xmi:id="_oFWFYSxyEeOMQpc6Y-MAJw" name="ret" direction="return"> - <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/> - </ownedParameter> - </ownedOperation> - </packagedElement> - </packagedElement> - </packagedElement> - </packagedElement> - </packagedElement> - <profileApplication xmi:id="_oDr4gCxyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDr4gSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/> - </eAnnotations> - <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/> - </profileApplication> - <profileApplication xmi:id="_oDr4gixyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDr4gyxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> - </eAnnotations> - <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> - </profileApplication> - <profileApplication xmi:id="_oDr4hCxyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDr4hSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> - </eAnnotations> - <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> - </profileApplication> - <profileApplication xmi:id="_oDsfkCxyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDsfkSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_oDsfkixyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDsfkyxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_3VS0wAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_oDtGoCxyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDtGoSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_ResourceCore"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_-1fcUBJdEdy3Td9UhuLFPg"/> - </profileApplication> - <profileApplication xmi:id="_oDtGoixyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDttsCxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Concurrency"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_A_vtYBJeEdy3Td9UhuLFPg"/> - </profileApplication> - <profileApplication xmi:id="_oDttsSxyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDttsixyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - <profileApplication xmi:id="_oDuUwCxyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDuUwSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Brokering"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_Cf874BJeEdy3Td9UhuLFPg"/> - </profileApplication> - <profileApplication xmi:id="_oDuUwixyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDuUwyxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Interaction"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_EIfnABJeEdy3Td9UhuLFPg"/> - </profileApplication> - <profileApplication xmi:id="_oDu70CxyEeOMQpc6Y-MAJw"> - <eAnnotations xmi:id="_oDu70SxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML"> - <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/> - </eAnnotations> - <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> - </profileApplication> - </uml:Model> - <C_Cpp:Include xmi:id="_11OtwPcaEd-KM6l7lmIPkw" body="#include <iostream>
#include <unistd.h>
using namespace std;" base_class="_tyiqsc__Ed-TP80eVS-2Rg"/> - <FCM:RuleApplication xmi:id="_Jyda4F7zEeGA7qTe7UD05A" base_Class="_tyiqsc__Ed-TP80eVS-2Rg"> - <containerRule href="pathmap://QML_CORE/core.uml#_3Jq5MARLEd-OidZzGKCpzg"/> - <containerRule href="pathmap://QML_CORE/core.uml#_3Jq5MARLEd-OidZzGKCpzg"/> - </FCM:RuleApplication> - <GCM:FlowPort xmi:id="_oDx_JSxyEeOMQpc6Y-MAJw" direction="in" base_Port="_tyiqs8__Ed-TP80eVS-2Rg"/> - <FCM:Port xmi:id="_oDx_JixyEeOMQpc6Y-MAJw" base_Port="_tyiqs8__Ed-TP80eVS-2Rg"> - <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:ConfigurationProperty xmi:id="_o8LRoF8DEeGerN33d-RdRg" base_Property="_kLNdAF8DEeGerN33d-RdRg"/> - <FCM:DerivedElement xmi:id="_oDz0UCxyEeOMQpc6Y-MAJw" base_Element="_tyjRy8__Ed-TP80eVS-2Rg"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_oDz0UixyEeOMQpc6Y-MAJw" base_Element="_tyjRzM__Ed-TP80eVS-2Rg"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/> - </FCM:DerivedElement> - <C_Cpp:Include xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include <iostream>
#include <unistd.h>
using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> - <FCM:Port xmi:id="_IWQqoP6yEd6Ie_kieu_3CQ" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"> - <kind href="pathmap://QML_CORE/core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/> - </FCM:Port> - <GCM:FlowPort xmi:id="_ow3PkJZ7EeCiU5xXzp1cKQ" direction="out" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"/> - <FCM:DerivedElement xmi:id="_oD23oSxyEeOMQpc6Y-MAJw" base_Element="_dH4RIKF4Ed6FqJCjEUrkqQ"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> - </FCM:DerivedElement> - <FCM:Connector xmi:id="_Kgl40FupEeGjjMeADLT5-g" base_Property="_EM2p4FupEeGjjMeADLT5-g"/> - <FCM:Target xmi:id="_oD7JECxyEeOMQpc6Y-MAJw" base_Node="_zY9vMDLiEd2RVeNawwNNzg"> - <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/> - <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/> - </FCM:Target> - <Alloc:Allocate xmi:id="_oD_agCxyEeOMQpc6Y-MAJw" base_Abstraction="_oD7wICxyEeOMQpc6Y-MAJw"/> - <GCM:FlowPort xmi:id="_oEE6ECxyEeOMQpc6Y-MAJw" direction="in" base_Port="_oEAooCxyEeOMQpc6Y-MAJw"/> - <FCM:Port xmi:id="_oELnwCxyEeOMQpc6Y-MAJw" base_Port="_oEAooCxyEeOMQpc6Y-MAJw"> - <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:Port xmi:id="_oEUxsCxyEeOMQpc6Y-MAJw" base_Port="_oENc8SxyEeOMQpc6Y-MAJw"> - <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:InteractionComponent xmi:id="_xQ_ccHUuEd6R5tffIPrlPg" base_Class="_Y1jF8HPpEd6R5tffIPrlPg"/> - <C_Cpp:Include xmi:id="_fUHyQF8DEeGerN33d-RdRg" body="#include <iostream>
using namespace std;" base_class="_Y1jF8HPpEd6R5tffIPrlPg"/> - <FCM:InteractionComponent xmi:id="_IwT2cP6_Ed6Zw96O-tCw7A" base_Class="_wh_EwHLmEd6R5tffIPrlPg"/> - <FCM:Port xmi:id="_42zlMHLnEd6R5tffIPrlPg" base_Port="_xHb7MHLmEd6R5tffIPrlPg"> - <kind href="pathmap://QML_CORE/core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:Port xmi:id="_57KlMHLnEd6R5tffIPrlPg" base_Port="_xcu1wHLmEd6R5tffIPrlPg"> - <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/> - </FCM:Port> - <FCM:ConfigurationProperty xmi:id="_FxN9cLC0EeCaaIdtw75MLg" base_Property="_XDRnoHUIEd6R5tffIPrlPg"/> - <FCM:DerivedElement xmi:id="_EYzyEP68Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A" source="_oFVeUSxyEeOMQpc6Y-MAJw"/> - <FCM:DerivedElement xmi:id="_0TVb8P6-Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_7HAIIP6-Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_vfETEARNEd-OidZzGKCpzg" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_op6Y4AnOEd-9beZpMGts2w" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_6tSQAAnUEd-co_m_wv4b6A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_YMw7cBGZEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_t04d8BGaEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_G7QQABGcEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_C5J9cBGlEd-Jq_XWT8Mhpg" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_IAxtYBI7Ed-3zOZ0RGapGA" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_AnPpIBI9Ed-XjYZ05V-9-Q" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_11WOABJWEd-QgZm_R1AKbA" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_C7WOoBQ-Ed-_dI0JopJMvQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_kUNw0Bb8Ed-u0pMEAnvpEQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_6-1mQBcKEd-Tda7vKXmT2A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_EYu5kP68Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A" source="_oFQl0SxyEeOMQpc6Y-MAJw"/> - <FCM:DerivedElement xmi:id="_0TRKgP6-Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_7G9E0P6-Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_vfBPwARNEd-OidZzGKCpzg" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_op38oAnOEd-9beZpMGts2w" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_6tRB4AnUEd-co_m_wv4b6A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_YMvtUBGZEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_t02owBGaEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_G7PB4BGcEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_C4zYIBGlEd-Jq_XWT8Mhpg" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_IAwfQBI7Ed-3zOZ0RGapGA" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_AnNM4BI9Ed-XjYZ05V-9-Q" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_11TxwBJWEd-QgZm_R1AKbA" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_C7UZcBQ-Ed-_dI0JopJMvQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_kUMisBb8Ed-u0pMEAnvpEQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:DerivedElement xmi:id="_6-zKABcKEd-Tda7vKXmT2A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/> - <FCM:Template xmi:id="_oE-5ACxyEeOMQpc6Y-MAJw" base_Element="_5IpEwK8xEeCXIcykFPsB8Q"/> - <FCM:DerivedElement xmi:id="_oE_gECxyEeOMQpc6Y-MAJw" base_Element="_5IpEwK8xEeCXIcykFPsB8Q"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_oFLtUCxyEeOMQpc6Y-MAJw" base_Element="_y7cqEF72EeGerN33d-RdRg"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_oFQl0CxyEeOMQpc6Y-MAJw" base_Element="_oFMUZCxyEeOMQpc6Y-MAJw" source="_wFJ3IP91Ed6Jt8e-UqrRdQ"/> - <FCM:DerivedElement xmi:id="_oFVeUCxyEeOMQpc6Y-MAJw" base_Element="_oFQl0yxyEeOMQpc6Y-MAJw" source="_wFJ3IP91Ed6Jt8e-UqrRdQ"/> - <FCM:DerivedElement xmi:id="_oFbk8CxyEeOMQpc6Y-MAJw" base_Element="_oFX6kCxyEeOMQpc6Y-MAJw"> - <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_ns4qsClUEeO4bs_nkcnKOg"/> - </FCM:DerivedElement> - <FCM:DerivedElement xmi:id="_oFqOcCxyEeOMQpc6Y-MAJw" base_Element="_oFmkECxyEeOMQpc6Y-MAJw" source="_oFWFYCxyEeOMQpc6Y-MAJw"/> -</xmi:XMI> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java new file mode 100644 index 00000000000..e1cc36702a5 --- /dev/null +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java @@ -0,0 +1,30 @@ +package org.eclipse.papyrus.infra.services.tracepoints; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.tracepoints.messages"; //$NON-NLS-1$ + + public static String TraceActionSelection_ClassOptions; + public static String TraceActionSelection_ImplementationOptions; + public static String TraceActionSelection_NoPluginsProvideTraceExt; + public static String TraceActionSelection_NotAvail; + public static String TraceActionSelection_OperationOptions; + public static String TraceActionSelection_SelectTraceAction; + public static String TraceActionSelection_StateOptions; + + public static String TPPreferencePage_ClassOptions; + public static String TPPreferencePage_OperationOptions; + public static String TPPreferencePage_StateOptions; + public static String TPPreferencePage_TMforOperations; + public static String TPPreferencePage_TMforPorts; + public static String TPPreferencePage_TMforStateMachines; + public static String TPPreferencePage_TraceOptions; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java index 6eaf7a25518..e8268e95b13 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java @@ -135,16 +135,16 @@ public class TraceActions { */ public static String getStringPrefix(TraceFeature feature) { if(feature == TraceFeature.Class) { - return "C:"; + return "C:"; //$NON-NLS-1$ } if(feature == TraceFeature.Port) { - return "P:"; + return "P:"; //$NON-NLS-1$ } else if(feature == TraceFeature.State) { - return "S:"; + return "S:"; //$NON-NLS-1$ } else if(feature == TraceFeature.Operation) { - return "O:"; + return "O:"; //$NON-NLS-1$ } return null; } @@ -171,12 +171,12 @@ public class TraceActions { else if(feature == TraceFeature.Operation) { return store.getString(TPPreferenceConstants.P_TRACE_OPTION_OP); } - return ""; + return ""; //$NON-NLS-1$ } public static String compositeClassOption(int classOption, int stateOption, int operationOption) { - return getStringPrefix(TraceFeature.Class) + classOption + "," + - getStringPrefix(TraceFeature.State) + stateOption + "," + + return getStringPrefix(TraceFeature.Class) + classOption + "," + //$NON-NLS-1$ + getStringPrefix(TraceFeature.State) + stateOption + "," + //$NON-NLS-1$ getStringPrefix(TraceFeature.Operation) + operationOption; } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java index eb9b2fc2a82..24aea1be26c 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java @@ -24,21 +24,21 @@ import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker; public class TraceFunctions implements IDecorationSpecificFunctions { - public static final String activeBreakpoint16 = "icons/etool16/brkp_16x16.gif"; + public static final String activeBreakpoint16 = "icons/etool16/brkp_16x16.gif"; //$NON-NLS-1$ - public static final String inActiveBreakpoint16 = "icons/etool16/brkpd_16x16.gif"; + public static final String inActiveBreakpoint16 = "icons/etool16/brkpd_16x16.gif"; //$NON-NLS-1$ - public static final String activeTracepoint16 = "icons/etool16/trcp_16x16.gif"; + public static final String activeTracepoint16 = "icons/etool16/trcp_16x16.gif"; //$NON-NLS-1$ - public static final String inActiveTracepoint16 = "icons/etool16/trcpd_16x16.gif"; + public static final String inActiveTracepoint16 = "icons/etool16/trcpd_16x16.gif"; //$NON-NLS-1$ - public static final String activeBreakpoint9 = "icons/etool16/brkp_9x9.gif"; + public static final String activeBreakpoint9 = "icons/etool16/brkp_9x9.gif"; //$NON-NLS-1$ - public static final String inActiveBreakpoint9 = "icons/etool16/brkpd_9x9.gif"; + public static final String inActiveBreakpoint9 = "icons/etool16/brkpd_9x9.gif"; //$NON-NLS-1$ - public static final String activeTracepoint11 = "icons/etool16/trcp_11x12.gif"; + public static final String activeTracepoint11 = "icons/etool16/trcp_11x12.gif"; //$NON-NLS-1$ - public static final String inActiveTracepoint11 = "icons/etool16/trcp_11x12.gif"; + public static final String inActiveTracepoint11 = "icons/etool16/trcp_11x12.gif"; //$NON-NLS-1$ /** * Return the image descriptor associated with a trace or breakpoint marker @@ -95,8 +95,8 @@ public class TraceFunctions implements IDecorationSpecificFunctions { public String getMessage(IPapyrusMarker marker) { boolean isActive = marker.getAttribute(TracepointConstants.isActive, false); boolean isTracepoint = marker.getAttribute(TracepointConstants.isTracepoint, false); - return (isActive ? "active" : "inactive") + " " + - (isTracepoint ? "trace point" : "break point"); + return (isActive ? "active" : "inactive") + " " + //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ + (isTracepoint ? "trace point" : "break point"); //$NON-NLS-1$//$NON-NLS-2$ } public int getPriority(IMarker marker) { diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java index 3edea4d3717..4866eb27422 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java @@ -31,7 +31,7 @@ import org.eclipse.papyrus.infra.services.tracepoints.preferences.TPPreferenceCo public class TraceMechanism { - public static final String ITRACE_MECHANISM_ID = Activator.PLUGIN_ID + ".traceMechanism"; + public static final String ITRACE_MECHANISM_ID = Activator.PLUGIN_ID + ".traceMechanism"; //$NON-NLS-1$ public static EList<ITraceMechanism> getTraceMechanisms() { @@ -41,7 +41,7 @@ public class TraceMechanism { for(IConfigurationElement configElement : configElements) { try { // TODO: cache returned instance (avoid creating a new instance each time => more efficient, no need for static attributes) - final Object obj = configElement.createExecutableExtension("class"); + final Object obj = configElement.createExecutableExtension("class"); //$NON-NLS-1$ if(obj instanceof ITraceMechanism) { mechanisms.add((ITraceMechanism)obj); } @@ -62,8 +62,8 @@ public class TraceMechanism { IPreferenceStore store = Activator.getDefault().getPreferenceStore(); if(store != null) { if(feature == TraceFeature.Class) { - return TraceActions.getStringPrefix(TraceFeature.Port) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_PORT) + "," + - TraceActions.getStringPrefix(TraceFeature.State) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_SM) + "," + + return TraceActions.getStringPrefix(TraceFeature.Port) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_PORT) + "," + //$NON-NLS-1$ + TraceActions.getStringPrefix(TraceFeature.State) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_SM) + "," + //$NON-NLS-1$ TraceActions.getStringPrefix(TraceFeature.Operation) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP); } else if(feature == TraceFeature.State) { @@ -73,7 +73,7 @@ public class TraceMechanism { return store.getString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP); } } - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java index f4d617c6e7c..7f29b3ccdde 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java @@ -20,13 +20,13 @@ public class TracepointConstants { /** * The id of the marker used for tracepoints and breakpoints */ - public static final String tpOrbpMarker = "org.eclipse.papyrus.tporbpmarker"; + public static final String tpOrbpMarker = "org.eclipse.papyrus.tporbpmarker"; //$NON-NLS-1$ - public static final String isActive = "isActive"; + public static final String isActive = "isActive"; //$NON-NLS-1$ - public static final String isTracepoint = "isTracepoint"; + public static final String isTracepoint = "isTracepoint"; //$NON-NLS-1$ - public static final String traceAction = "traceAction"; + public static final String traceAction = "traceAction"; //$NON-NLS-1$ - public static final String traceMechanism = "traceMechanism"; + public static final String traceMechanism = "traceMechanism"; //$NON-NLS-1$ } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java index 5f6758a19f8..3aacc8ea5cd 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java @@ -68,7 +68,7 @@ abstract public class AbstractTracepointCommand extends AbstractTransactionalCom protected void updateResourceAndURI() { resource = selectedElement.eResource(); - uri = resource.getURI() + "#" + resource.getURIFragment(selectedElement); + uri = resource.getURI() + "#" + resource.getURIFragment(selectedElement); //$NON-NLS-1$ iresource = WorkspaceSynchronizer.getFile(selectedElement.eResource()); } @@ -77,7 +77,7 @@ abstract public class AbstractTracepointCommand extends AbstractTransactionalCom if(iresource != null) { try { for(IMarker marker : iresource.findMarkers(type, false, IResource.DEPTH_INFINITE)) { - String markerURI = marker.getAttribute(MarkerConstants.uri, ""); + String markerURI = marker.getAttribute(MarkerConstants.uri, ""); //$NON-NLS-1$ if((markerURI != null) && markerURI.equals(uri)) { return marker; } @@ -124,7 +124,7 @@ abstract public class AbstractTracepointCommand extends AbstractTransactionalCom id = store.getDefaultString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP); } else if(selectedElement instanceof Port) { - id = store.getDefaultString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP); + id = store.getDefaultString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_PORT); } else if(selectedElement instanceof State) { id = store.getDefaultString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_SM); diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java index aac91107a20..cb86d378340 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java @@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult; public class ToggleBreakpointActivationCommand extends AbstractTracepointCommand { public ToggleBreakpointActivationCommand(EObject selectedElement) { - super("Toggle Breakpoint activation", TransactionUtil.getEditingDomain(selectedElement), selectedElement); + super("Toggle Breakpoint activation", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$ } /** diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java index 2a3dcc3d415..60c891cd02f 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java @@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult; public class ToggleBreakpointCommand extends AbstractTracepointCommand { public ToggleBreakpointCommand(EObject selectedElement) { - super("Toggle Breakpoint", TransactionUtil.getEditingDomain(selectedElement), selectedElement); + super("Toggle Breakpoint", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$ } /** diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java index 0b636e0b2cc..6881780fde1 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java @@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult; public class ToggleTracepointActivationCommand extends AbstractTracepointCommand { public ToggleTracepointActivationCommand(EObject selectedElement) { - super("Toggle tracepoint activation", TransactionUtil.getEditingDomain(selectedElement), selectedElement); + super("Toggle tracepoint activation", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$ } /** diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java index 178f271b95e..5130ae7dbbb 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java @@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants; public class ToggleTracepointCommand extends AbstractTracepointCommand { public ToggleTracepointCommand(EObject selectedElement) { - super("Toggle tracepoint", TransactionUtil.getEditingDomain(selectedElement), selectedElement); + super("Toggle tracepoint", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$ } /** diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java index feca6cb8a7c..791bd165fd1 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java @@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.Element; public class TracepointPropertiesCommand extends AbstractTracepointCommand { public TracepointPropertiesCommand(EObject selectedElement) { - super("Tracepoint properties", TransactionUtil.getEditingDomain(selectedElement), selectedElement); + super("Tracepoint properties", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$ } /** diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java index b1258f9f19e..5036cd650db 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java @@ -31,6 +31,7 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; import org.eclipse.papyrus.infra.services.tracepoints.ITraceMechanism; +import org.eclipse.papyrus.infra.services.tracepoints.Messages; import org.eclipse.papyrus.infra.services.tracepoints.TraceActions; import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAClass; import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation; @@ -106,7 +107,7 @@ public class TraceActionSelection extends SelectionStatusDialog { else if(m_me instanceof Operation) { traceActionValue = operationOptions.getResult(); } - String traceMechanism = ""; + String traceMechanism = ""; //$NON-NLS-1$ for(Object tableElement : fTraceImplementations.getCheckedElements()) { traceMechanism = (String)tableElement; }; @@ -149,7 +150,7 @@ public class TraceActionSelection extends SelectionStatusDialog { EList<ITraceMechanism> mechanisms = TraceMechanism.getTraceMechanisms(); if(mechanisms.size() == 0) { - items = new String[]{ "no plugins provide trace extension mechanism" }; + items = new String[]{ Messages.TraceActionSelection_NoPluginsProvideTraceExt }; } else { EList<String> idList = new BasicEList<String>(); @@ -168,7 +169,7 @@ public class TraceActionSelection extends SelectionStatusDialog { Composite contents = (Composite)super.createDialogArea(parent); Label label = new Label(contents, SWT.NONE); - label.setText("Select trace action for this element"); + label.setText(Messages.TraceActionSelection_SelectTraceAction); // need context dependent dialogs on options // we may need more than one options (e.g. AllOperations + OperationsWithParameters + (begin/end or both?)) @@ -177,28 +178,28 @@ public class TraceActionSelection extends SelectionStatusDialog { String[][] taClassOptions = TraceActions.getStringFields(TAClass.values()); String[][] taStateOptions = TraceActions.getStringFields(TAState.values()); String[][] taOperationOptions = TraceActions.getStringFields(TAOperation.values()); - String actionString = m_marker.getAttribute(TracepointConstants.traceAction, ""); - String mechanismID = m_marker.getAttribute(TracepointConstants.traceMechanism, ""); + String actionString = m_marker.getAttribute(TracepointConstants.traceAction, ""); //$NON-NLS-1$ + String mechanismID = m_marker.getAttribute(TracepointConstants.traceMechanism, ""); //$NON-NLS-1$ if(m_me instanceof State) { - stateOptions = new BinaryEncodedMChoiceFieldEditor("State options", 3, taStateOptions, contents, true); + stateOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_StateOptions, 3, taStateOptions, contents, true); stateOptions.setupViaString(actionString); } else if(m_me instanceof Class) { - classOptions = new BinaryEncodedMChoiceFieldEditor("Class options", 3, taClassOptions, contents, true); - stateOptions = new BinaryEncodedMChoiceFieldEditor("State options", 3, taStateOptions, contents, true); - operationOptions = new BinaryEncodedMChoiceFieldEditor("Operation options", 3, taOperationOptions, contents, true); + classOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_ClassOptions, 3, taClassOptions, contents, true); + stateOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_StateOptions, 3, taStateOptions, contents, true); + operationOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_OperationOptions, 3, taOperationOptions, contents, true); classOptions.setupViaString(TraceActions.getOptions(actionString, TraceFeature.Class)); stateOptions.setupViaString(TraceActions.getOptions(actionString, TraceFeature.State)); operationOptions.setupViaString(TraceActions.getOptions(actionString, TraceFeature.Operation)); } else if(m_me instanceof Operation) { - operationOptions = new BinaryEncodedMChoiceFieldEditor("Operation options", 3, taOperationOptions, contents, true); + operationOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_OperationOptions, 3, taOperationOptions, contents, true); operationOptions.setupViaString(actionString); } Group implementationGroup = new Group(parent, SWT.NONE); - implementationGroup.setText("Implementation options"); + implementationGroup.setText(Messages.TraceActionSelection_ImplementationOptions); // need additional item how the trace mechanism should be realized, i.e. available tracing mechanisms fTraceImplementations = CheckboxTableViewer.newCheckList(implementationGroup, SWT.H_SCROLL | SWT.V_SCROLL); @@ -241,7 +242,7 @@ public class TraceActionSelection extends SelectionStatusDialog { } } if(noDesc) { - fDescription.setText("<not available>"); + fDescription.setText(Messages.TraceActionSelection_NotAvail); } } } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties new file mode 100644 index 00000000000..94ce99780de --- /dev/null +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties @@ -0,0 +1,15 @@ +TPPreferencePage_ClassOptions=Class options +TPPreferencePage_OperationOptions=Operations options +TPPreferencePage_StateOptions=State options +TPPreferencePage_TMforOperations=Trace Mechanism for operations (+construction/destruction) +TPPreferencePage_TMforPorts=Trace Mechanism for ports +TPPreferencePage_TMforStateMachines=Trace Mechanism for state machines +TPPreferencePage_TraceOptions=Trace options + +TraceActionSelection_ClassOptions=Class options +TraceActionSelection_ImplementationOptions=Implementation options +TraceActionSelection_NoPluginsProvideTraceExt=no plugins provide trace extension mechanism +TraceActionSelection_NotAvail=<not available> +TraceActionSelection_OperationOptions=Operation options +TraceActionSelection_SelectTraceAction=Select trace action for this element +TraceActionSelection_StateOptions=State options
\ No newline at end of file diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java index b8db97671e8..243fbc81143 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java @@ -61,7 +61,7 @@ public class BinaryEncodedMChoiceFieldEditor extends MultipleChoiceFieldEditor { * display contents within a group */ public BinaryEncodedMChoiceFieldEditor(String labeltext, int numColumns, String[][] labelsAndValues, Composite parent, boolean useGroup) { - super("", labeltext, numColumns, labelsAndValues, parent, useGroup); + super("", labeltext, numColumns, labelsAndValues, parent, useGroup); //$NON-NLS-1$ } /** @@ -105,7 +105,7 @@ public class BinaryEncodedMChoiceFieldEditor extends MultipleChoiceFieldEditor { int index = 0; for(String setting[] : settings) { // [0] = name, [1] = value [2] = checked - if(setting[2].equals("true")) { + if(setting[2].equals("true")) { //$NON-NLS-1$ traceActionValue += 1 << index; } index++; diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java index 2a0845bb849..ae73d5f9a71 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java @@ -21,31 +21,31 @@ public class TPPreferenceConstants { /** * The trace mechanism that should be used by default */ - public static final String P_TRACE_IMPLEMENTATION_PORT = "papyrus.trace.implementation.port"; + public static final String P_TRACE_IMPLEMENTATION_PORT = "papyrus.trace.implementation.port"; //$NON-NLS-1$ /** * The trace mechanism that should be used by default */ - public static final String P_TRACE_IMPLEMENTATION_OP = "papyrus.trace.implementation.op"; + public static final String P_TRACE_IMPLEMENTATION_OP = "papyrus.trace.implementation.op"; //$NON-NLS-1$ /** * The trace mechanism that should be used by default */ - public static final String P_TRACE_IMPLEMENTATION_SM = "papyrus.trace.implementation.sm"; + public static final String P_TRACE_IMPLEMENTATION_SM = "papyrus.trace.implementation.sm"; //$NON-NLS-1$ /** * Options for trace implementation via state machines */ - public static final String P_TRACE_OPTION_CLASS = "papyrus.trace.option.class"; + public static final String P_TRACE_OPTION_CLASS = "papyrus.trace.option.class"; //$NON-NLS-1$ /** * Options for trace implementation for operations */ - public static final String P_TRACE_OPTION_STATE = "papyrus.trace.option.state"; - + public static final String P_TRACE_OPTION_STATE = "papyrus.trace.option.state"; //$NON-NLS-1$ + /** * Options for trace implementation via state machines */ - public static final String P_TRACE_OPTION_OP = "papyrus.trace.option.op"; + public static final String P_TRACE_OPTION_OP = "papyrus.trace.option.op"; //$NON-NLS-1$ } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java index 096d661169d..ef1cfad72d7 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java @@ -33,7 +33,7 @@ public class TPPreferenceInitializer extends AbstractPreferenceInitializer { public void initializeDefaultPreferences() { IPreferenceStore store = Activator.getDefault().getPreferenceStore(); EList<ITraceMechanism> mechanisms = TraceMechanism.getTraceMechanisms(); - String mechanismID = ""; + String mechanismID = ""; //$NON-NLS-1$ if(mechanisms.size() > 0) { ITraceMechanism mechanism = mechanisms.get(0); // TODO: function need to support null object diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java index 773c30a6ee1..57554c5b6ea 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java @@ -19,6 +19,7 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.RadioGroupFieldEditor; import org.eclipse.papyrus.infra.services.tracepoints.Activator; import org.eclipse.papyrus.infra.services.tracepoints.ITraceMechanism; +import org.eclipse.papyrus.infra.services.tracepoints.Messages; import org.eclipse.papyrus.infra.services.tracepoints.TraceActions; import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAClass; import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation; @@ -41,7 +42,7 @@ public class TPPreferencePage public TPPreferencePage() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setDescription("Trace options"); + setDescription(Messages.TPPreferencePage_TraceOptions); } /** @@ -74,25 +75,25 @@ public class TPPreferencePage String[][] taStateOptions = TraceActions.getStringFields(TAState.values()); String[][] taOperationOptions = TraceActions.getStringFields(TAOperation.values()); - addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_CLASS, "Class options", 3, taClassOptions, getFieldEditorParent(), true)); + addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_CLASS, Messages.TPPreferencePage_ClassOptions, 3, taClassOptions, getFieldEditorParent(), true)); - addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_STATE, "State options", 3, taStateOptions, getFieldEditorParent(), true)); + addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_STATE, Messages.TPPreferencePage_StateOptions, 3, taStateOptions, getFieldEditorParent(), true)); addField(new RadioGroupFieldEditor( TPPreferenceConstants.P_TRACE_OPTION_OP, - "Operations options", 3, taOperationOptions, getFieldEditorParent(), true)); + Messages.TPPreferencePage_OperationOptions, 3, taOperationOptions, getFieldEditorParent(), true)); addField(new ComboFieldEditor( TPPreferenceConstants.P_TRACE_IMPLEMENTATION_PORT, - "Trace Mechanism for ports", mechList, getFieldEditorParent())); + Messages.TPPreferencePage_TMforPorts, mechList, getFieldEditorParent())); addField(new ComboFieldEditor( TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP, - "Trace Mechanism for operations (+construction/destruction)", mechList, getFieldEditorParent())); + Messages.TPPreferencePage_TMforOperations, mechList, getFieldEditorParent())); addField(new ComboFieldEditor( TPPreferenceConstants.P_TRACE_IMPLEMENTATION_SM, - "Trace Mechanism for state machines", mechList, getFieldEditorParent())); + Messages.TPPreferencePage_TMforStateMachines, mechList, getFieldEditorParent())); } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo index 0bc08b54a4a..94def70bf62 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo @@ -18,7 +18,7 @@ <acceleoCompiler sourceFolder="${target.folder}" outputFolder="${target.folder}" - dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;${target.folder}/../../org.eclipse.papyrus.qompass.designer.ui;" + dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;${target.folder}/../../org.eclipse.papyrus.qompass.designer.ui;" binaryResource="false" packagesToRegister=""> </acceleoCompiler> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di new file mode 100644 index 00000000000..4b69336c601 --- /dev/null +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode"> + <di:SashWindowsMngr> + <pageList> + <availablePage> + <emfPageIdentifier href="SampleOOTraceTest.notation#_XSHWMF36Ed-UvNEDwY5GNg"/> + </availablePage> + <availablePage/> + <availablePage/> + <availablePage> + <emfPageIdentifier href="SampleOOTraceTest.notation#_rbZ3IDeFEeGPyrZ5I3hMlA"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="SampleOOTraceTest.notation#_Rk2pgDVlEeKoYLVLZgpRiw"/> + </availablePage> + <availablePage> + <emfPageIdentifier href="SampleOOTraceTest.notation#_57mwQDclEeKAhIrFXfR8zQ"/> + </availablePage> + </pageList> + <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0"> + <windows> + <children xsi:type="di:TabFolder"> + <children> + <emfPageIdentifier href="SampleOOTraceTest.notation#_XSHWMF36Ed-UvNEDwY5GNg"/> + </children> + <children> + <emfPageIdentifier href="SampleOOTraceTest.notation#_rbZ3IDeFEeGPyrZ5I3hMlA"/> + </children> + <children> + <emfPageIdentifier href="SampleOOTraceTest.notation#_Rk2pgDVlEeKoYLVLZgpRiw"/> + </children> + <children> + <emfPageIdentifier href="SampleOOTraceTest.notation#_57mwQDclEeKAhIrFXfR8zQ"/> + </children> + </children> + </windows> + </sashModel> + </di:SashWindowsMngr> + <history:ControledResource/> + <history:ControledResource/> + <history:ControledResource/> + <history:ControledResource/> + <history:ControledResource/> + <history:ControledResource/> + <history:ControledResource/> +</xmi:XMI> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation new file mode 100644 index 00000000000..62727ee1920 --- /dev/null +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation @@ -0,0 +1,410 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" 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="_XSHWMF36Ed-UvNEDwY5GNg" type="PapyrusUMLClassDiagram" name="Interfaces" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_Pj6oUDeEEeGPyrZ5I3hMlA" type="2004" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pj6oUjeEEeGPyrZ5I3hMlA" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pj7PYDeEEeGPyrZ5I3hMlA" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pj7PYTeEEeGPyrZ5I3hMlA" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pj7PYjeEEeGPyrZ5I3hMlA" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pj7PYzeEEeGPyrZ5I3hMlA" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pj7PZDeEEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_Pj7PZTeEEeGPyrZ5I3hMlA" type="5011"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_Pj7PZjeEEeGPyrZ5I3hMlA" visible="false" type="7006"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Pj7PZzeEEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Pj7PaDeEEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Pj7PaTeEEeGPyrZ5I3hMlA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pj7PajeEEeGPyrZ5I3hMlA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Pj7PazeEEeGPyrZ5I3hMlA" type="7007"> + <children xmi:type="notation:Shape" xmi:id="_R8Rm0DeEEeGPyrZ5I3hMlA" type="3007" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1B21kCwNEeK0G9oarbCn5Q" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1I5RsCwNEeK0G9oarbCn5Q" key="CustomAppearance_MaskValue" value="6408"/> + </eAnnotations> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_DGs6wDLgEd28fJKJJnUaeQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_R8Rm0TeEEeGPyrZ5I3hMlA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_R8SN4DeEEeGPyrZ5I3hMlA" type="3007" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2ZBc0CwNEeK0G9oarbCn5Q" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2dz2MCwNEeK0G9oarbCn5Q" key="CustomAppearance_MaskValue" value="6408"/> + </eAnnotations> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_L8EY8DLgEd28fJKJJnUaeQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_R8SN4TeEEeGPyrZ5I3hMlA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_rsWQcDVdEeKoYLVLZgpRiw" type="3007" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8MrPMDVdEeKoYLVLZgpRiw" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8ftf8DVdEeKoYLVLZgpRiw" key="CustomAppearance_MaskValue" value="6408"/> + </eAnnotations> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_rrbqcDVdEeKoYLVLZgpRiw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_rsWQcTVdEeKoYLVLZgpRiw"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_6E33wDW2EeKyT6LlKoWJIA" type="3007" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JvVlgDW3EeKyT6LlKoWJIA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_J0pjUDW3EeKyT6LlKoWJIA" key="CustomAppearance_MaskValue" value="6408"/> + </eAnnotations> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_6DewoDW2EeKyT6LlKoWJIA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_6E33wTW2EeKyT6LlKoWJIA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_Pj7PbDeEEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Pj7PbTeEEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Pj7PbjeEEeGPyrZ5I3hMlA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pj7PbzeEEeGPyrZ5I3hMlA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Pj7PcDeEEeGPyrZ5I3hMlA" visible="false" type="7008"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Pj7PcTeEEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_Pj7PcjeEEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_Pj7PczeEEeGPyrZ5I3hMlA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pj7PdDeEEeGPyrZ5I3hMlA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_VTHeYFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_VTHeYVFyEeOLNIKOajeerQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VTHeYlFyEeOLNIKOajeerQ"/> + </children> + <element xmi:type="uml:Interface" href="SampleOOTraceTest.uml#_cn-H0DLbEd2qeKRLMdIx_A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pj6oUTeEEeGPyrZ5I3hMlA" x="108" y="81" width="321"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_TP_4gDeEEeGPyrZ5I3hMlA" type="2012" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TQAfkDeEEeGPyrZ5I3hMlA" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TQAfkTeEEeGPyrZ5I3hMlA" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TQAfkjeEEeGPyrZ5I3hMlA" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TQAfkzeEEeGPyrZ5I3hMlA" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TQAflDeEEeGPyrZ5I3hMlA" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TQAflTeEEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_TQAfljeEEeGPyrZ5I3hMlA" type="5038"/> + <element xmi:type="uml:Comment" href="SampleOOTraceTest.uml#_TDDBoDeEEeGPyrZ5I3hMlA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TP_4gTeEEeGPyrZ5I3hMlA" x="513" y="108" width="203"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_ktdOQDW2EeKyT6LlKoWJIA" type="2010" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ktd1UDW2EeKyT6LlKoWJIA" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ktd1UTW2EeKyT6LlKoWJIA" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ktd1UjW2EeKyT6LlKoWJIA" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ktd1UzW2EeKyT6LlKoWJIA" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ktd1VDW2EeKyT6LlKoWJIA" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ktd1VTW2EeKyT6LlKoWJIA" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_ktd1VjW2EeKyT6LlKoWJIA" type="5035"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_ktd1VzW2EeKyT6LlKoWJIA" type="7020"> + <children xmi:type="notation:Shape" xmi:id="_m0rZcDW2EeKyT6LlKoWJIA" type="3018" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QleJQJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QrfRsJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> + <element xmi:type="uml:Property" href="SampleOOTraceTest.uml#_m0WCQDW2EeKyT6LlKoWJIA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_m0rZcTW2EeKyT6LlKoWJIA"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_yJR6MDW2EeKyT6LlKoWJIA" type="3018" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QlfXYJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qrf4wJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/> + </eAnnotations> + <element xmi:type="uml:Property" href="SampleOOTraceTest.uml#_yJIJMDW2EeKyT6LlKoWJIA"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_yJR6MTW2EeKyT6LlKoWJIA"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_ktd1WDW2EeKyT6LlKoWJIA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ktd1WTW2EeKyT6LlKoWJIA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ktd1WjW2EeKyT6LlKoWJIA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktd1WzW2EeKyT6LlKoWJIA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_ktecYDW2EeKyT6LlKoWJIA" visible="false" type="7021"> + <styles xmi:type="notation:TitleStyle" xmi:id="_ktecYTW2EeKyT6LlKoWJIA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_ktecYjW2EeKyT6LlKoWJIA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_ktecYzW2EeKyT6LlKoWJIA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktecZDW2EeKyT6LlKoWJIA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_VTLIwFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_VTLIwVFyEeOLNIKOajeerQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VTLIwlFyEeOLNIKOajeerQ"/> + </children> + <element xmi:type="uml:DataType" href="SampleOOTraceTest.uml#_krMkcDW2EeKyT6LlKoWJIA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktdOQTW2EeKyT6LlKoWJIA" x="121" y="262" width="141" height="90"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_XSHWMV36Ed-UvNEDwY5GNg"/> + <element xmi:type="uml:Package" href="SampleOOTraceTest.uml#_Tp4n8DLaEd2qeKRLMdIx_A"/> + <edges xmi:type="notation:Connector" xmi:id="_Y-hhkDeEEeGPyrZ5I3hMlA" type="4013" source="_TP_4gDeEEeGPyrZ5I3hMlA" target="_Pj6oUDeEEeGPyrZ5I3hMlA" lineColor="0"> + <styles xmi:type="notation:FontStyle" xmi:id="_Y-hhkTeEEeGPyrZ5I3hMlA" fontName="Sans Serif"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y-hhkjeEEeGPyrZ5I3hMlA" points="[-29, -1, 113, 0]$[-113, -1, 29, 0]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y_9sADeEEeGPyrZ5I3hMlA" id="(0.14285714285714285,0.5166666666666667)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y_9sATeEEeGPyrZ5I3hMlA" id="(0.9096573208722741,0.5377358490566038)"/> + </edges> + </notation:Diagram> + <notation:Diagram xmi:id="_rbZ3IDeFEeGPyrZ5I3hMlA" type="PapyrusUMLClassDiagram" name="ClassDiagram Client" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_t6z40DeFEeGPyrZ5I3hMlA" type="2008" fontName="Sans Serif" fillColor="8905185" gradient="16777215, 16777215, 0" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t60f4DeFEeGPyrZ5I3hMlA" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t60f4TeFEeGPyrZ5I3hMlA" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t60f4jeFEeGPyrZ5I3hMlA" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t60f4zeFEeGPyrZ5I3hMlA" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t60f5DeFEeGPyrZ5I3hMlA" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t60f5TeFEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_t61G8DeFEeGPyrZ5I3hMlA" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_t61G8TeFEeGPyrZ5I3hMlA" type="7017"> + <styles xmi:type="notation:TitleStyle" xmi:id="_t61G8jeFEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_t61G8zeFEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_t61G9DeFEeGPyrZ5I3hMlA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t61G9TeFEeGPyrZ5I3hMlA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_t61G9jeFEeGPyrZ5I3hMlA" type="7018"> + <children xmi:type="notation:Shape" xmi:id="_Q07G0DclEeKAhIrFXfR8zQ" type="3013" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z-c2gDc_EeKPle9CbXIcpQ" source="CustomAppearance_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0IwpEDc_EeKPle9CbXIcpQ" key="CustomAppearance_MaskValue" value="6408"/> + </eAnnotations> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_Qzp7gDclEeKAhIrFXfR8zQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_Q07G0TclEeKAhIrFXfR8zQ"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_cssnQDc_EeKPle9CbXIcpQ" type="3013" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_ZnGj0EdDEeGxo4rn9hBAOQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_cssnQTc_EeKPle9CbXIcpQ" x="15" y="21"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_t61G9zeFEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_t61G-DeFEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_t61G-TeFEeGPyrZ5I3hMlA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t61G-jeFEeGPyrZ5I3hMlA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_t61G-zeFEeGPyrZ5I3hMlA" visible="false" type="7019"> + <styles xmi:type="notation:TitleStyle" xmi:id="_t61G_DeFEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_t61G_TeFEeGPyrZ5I3hMlA"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_t61G_jeFEeGPyrZ5I3hMlA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t61G_zeFEeGPyrZ5I3hMlA"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_VtNZYFFyEeOLNIKOajeerQ" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_VtNZYVFyEeOLNIKOajeerQ" showTitle="true"/> + <element xmi:type="C_Cpp:Include" href="SampleOOTraceTest.uml#_7SAnAP76Ed6Zw96O-tCw7A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtNZYlFyEeOLNIKOajeerQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_VtNZY1FyEeOLNIKOajeerQ" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_VtNZZFFyEeOLNIKOajeerQ" showTitle="true"/> + <element xmi:type="FCM:RuleApplication" href="SampleOOTraceTest.uml#__bC_ADcmEeKAhIrFXfR8zQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtNZZVFyEeOLNIKOajeerQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_VtNZZlFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_VtNZZ1FyEeOLNIKOajeerQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtNZaFFyEeOLNIKOajeerQ"/> + </children> + <element xmi:type="uml:Class" href="SampleOOTraceTest.uml#_IfjoETLbEd2qeKRLMdIx_A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t6z40TeFEeGPyrZ5I3hMlA" x="90" y="135" width="144"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_fBkXMDeGEeGPyrZ5I3hMlA" type="2012" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fBk-QDeGEeGPyrZ5I3hMlA" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fBk-QTeGEeGPyrZ5I3hMlA" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fBk-QjeGEeGPyrZ5I3hMlA" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fBk-QzeGEeGPyrZ5I3hMlA" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fBk-RDeGEeGPyrZ5I3hMlA" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fBllUDeGEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_fBllUTeGEeGPyrZ5I3hMlA" type="5038"/> + <element xmi:type="uml:Comment" href="SampleOOTraceTest.uml#_fBRcQDeGEeGPyrZ5I3hMlA"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fBkXMTeGEeGPyrZ5I3hMlA" x="45" y="279" width="441" height="89"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_rbZ3ITeFEeGPyrZ5I3hMlA"/> + <element xmi:type="uml:Package" href="SampleOOTraceTest.uml#_etOZkDLaEd2qeKRLMdIx_A"/> + <edges xmi:type="notation:Connector" xmi:id="_f6Wj4DeHEeGPyrZ5I3hMlA" type="4013" source="_fBkXMDeGEeGPyrZ5I3hMlA" target="_t6z40DeFEeGPyrZ5I3hMlA" lineColor="0"> + <styles xmi:type="notation:FontStyle" xmi:id="_f6Wj4TeHEeGPyrZ5I3hMlA" fontName="Sans Serif"/> + <element xsi:nil="true"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f6Wj4jeHEeGPyrZ5I3hMlA" points="[-3, -11, 18, 93]$[-19, -84, 2, 20]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f68ZwDeHEeGPyrZ5I3hMlA" id="(0.14512471655328799,0.11224489795918367)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f68ZwTeHEeGPyrZ5I3hMlA" id="(0.4,0.85)"/> + </edges> + </notation:Diagram> + <notation:Diagram xmi:id="_Rk2pgDVlEeKoYLVLZgpRiw" type="PapyrusUMLClassDiagram" name="ClassDiagram Server" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_SeK3IDVlEeKoYLVLZgpRiw" type="2008" fontName="Sans Serif" fillColor="8905185" gradient="16777215, 16777215, 0" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SeMsUDVlEeKoYLVLZgpRiw" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SeMsUTVlEeKoYLVLZgpRiw" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SeMsUjVlEeKoYLVLZgpRiw" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SeMsUzVlEeKoYLVLZgpRiw" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SeMsVDVlEeKoYLVLZgpRiw" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SeMsVTVlEeKoYLVLZgpRiw" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cLIEoDVlEeKoYLVLZgpRiw" source="Stereotype_Annotation"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8QDVlEeKoYLVLZgpRiw" key="StereotypeWithQualifiedNameList" value=""/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8QTVlEeKoYLVLZgpRiw" key="StereotypeList" value="FCM::RuleApplication"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8QjVlEeKoYLVLZgpRiw" key="PropStereoDisplay" value="FCM::RuleApplication.containerRule"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8QzVlEeKoYLVLZgpRiw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8RDVlEeKoYLVLZgpRiw" key="StereotypePropertyLocation" value="Compartment"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_SeNTYDVlEeKoYLVLZgpRiw" type="5029"/> + <children xmi:type="notation:BasicCompartment" xmi:id="_SeNTYTVlEeKoYLVLZgpRiw" type="7017"> + <styles xmi:type="notation:TitleStyle" xmi:id="_SeNTYjVlEeKoYLVLZgpRiw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_SeNTYzVlEeKoYLVLZgpRiw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_SeNTZDVlEeKoYLVLZgpRiw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeNTZTVlEeKoYLVLZgpRiw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_SeNTZjVlEeKoYLVLZgpRiw" type="7018"> + <children xmi:type="notation:Shape" xmi:id="_VGZdoDVlEeKoYLVLZgpRiw" type="3013" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_4ZEZwHecEd6r18stFZxmFQ"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_VGZdoTVlEeKoYLVLZgpRiw"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_VGaEsDVlEeKoYLVLZgpRiw" type="3013" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_TbIjUJYlEd6G9q9hwr11bw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_VGaEsTVlEeKoYLVLZgpRiw"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_VGarwDVlEeKoYLVLZgpRiw" type="3013" fontName="Sans Serif" lineColor="0"> + <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_rrf74DVdEeKoYLVLZgpRiw"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_VGarwTVlEeKoYLVLZgpRiw"/> + </children> + <styles xmi:type="notation:TitleStyle" xmi:id="_SeNTZzVlEeKoYLVLZgpRiw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_SeNTaDVlEeKoYLVLZgpRiw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_SeNTaTVlEeKoYLVLZgpRiw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeNTajVlEeKoYLVLZgpRiw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_SeNTazVlEeKoYLVLZgpRiw" visible="false" type="7019"> + <styles xmi:type="notation:TitleStyle" xmi:id="_SeNTbDVlEeKoYLVLZgpRiw"/> + <styles xmi:type="notation:SortingStyle" xmi:id="_SeNTbTVlEeKoYLVLZgpRiw"/> + <styles xmi:type="notation:FilteringStyle" xmi:id="_SeNTbjVlEeKoYLVLZgpRiw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeNTbzVlEeKoYLVLZgpRiw"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_Vw_GIFFyEeOLNIKOajeerQ" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_Vw_GIVFyEeOLNIKOajeerQ" showTitle="true"/> + <element xmi:type="FCM:RuleApplication" href="SampleOOTraceTest.uml#_DWIYoP6yEd6Ie_kieu_3CQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vw_GIlFyEeOLNIKOajeerQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_VxBiYFFyEeOLNIKOajeerQ" visible="false" type="AppliedStereotypeCompartement"> + <styles xmi:type="notation:TitleStyle" xmi:id="_VxBiYVFyEeOLNIKOajeerQ" showTitle="true"/> + <element xmi:type="C_Cpp:Include" href="SampleOOTraceTest.uml#_Sa4nEP77Ed6Zw96O-tCw7A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VxBiYlFyEeOLNIKOajeerQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_VxCJcFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_VxCJcVFyEeOLNIKOajeerQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VxCJclFyEeOLNIKOajeerQ"/> + </children> + <element xmi:type="uml:Class" href="SampleOOTraceTest.uml#_oqZNUDLaEd2qeKRLMdIx_A"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeK3ITVlEeKoYLVLZgpRiw" x="176" y="95" width="266" height="203"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_Rk2pgTVlEeKoYLVLZgpRiw"/> + <element xmi:type="uml:Package" href="SampleOOTraceTest.uml#_OGM88DLaEd2qeKRLMdIx_A"/> + </notation:Diagram> + <notation:Diagram xmi:id="_57mwQDclEeKAhIrFXfR8zQ" type="PapyrusUMLStateMachineDiagram" name="SmDiagram" measurementUnit="Pixel"> + <children xmi:type="notation:Shape" xmi:id="_57mwQTclEeKAhIrFXfR8zQ" type="2000" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwQjclEeKAhIrFXfR8zQ" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwQzclEeKAhIrFXfR8zQ" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwRDclEeKAhIrFXfR8zQ" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwRTclEeKAhIrFXfR8zQ" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwRjclEeKAhIrFXfR8zQ" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwRzclEeKAhIrFXfR8zQ" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_57mwSDclEeKAhIrFXfR8zQ" type="2001"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwSTclEeKAhIrFXfR8zQ" width="592" height="14"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_57mwSjclEeKAhIrFXfR8zQ" type="2002"> + <children xmi:type="notation:Shape" xmi:id="_57mwSzclEeKAhIrFXfR8zQ" type="3000" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwTDclEeKAhIrFXfR8zQ" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwTTclEeKAhIrFXfR8zQ" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwTjclEeKAhIrFXfR8zQ" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwTzclEeKAhIrFXfR8zQ" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwUDclEeKAhIrFXfR8zQ" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwUTclEeKAhIrFXfR8zQ" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwUjclEeKAhIrFXfR8zQ" source="RegionAnnotationKey"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwUzclEeKAhIrFXfR8zQ" key="RegionZoneKey" value=""/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_57mwVDclEeKAhIrFXfR8zQ" type="3002"> + <children xmi:type="notation:Shape" xmi:id="_66VCUDclEeKAhIrFXfR8zQ" type="6000" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_66VpYDclEeKAhIrFXfR8zQ" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_66VpYTclEeKAhIrFXfR8zQ" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_66VpYjclEeKAhIrFXfR8zQ" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_66VpYzclEeKAhIrFXfR8zQ" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_66VpZDclEeKAhIrFXfR8zQ" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_66VpZTclEeKAhIrFXfR8zQ" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_66VpZjclEeKAhIrFXfR8zQ" type="6001"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_67AXwDclEeKAhIrFXfR8zQ" width="109" height="14"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_66WQcDclEeKAhIrFXfR8zQ" type="6002"> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66WQcTclEeKAhIrFXfR8zQ" y="14" width="109" height="74"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_V17QgFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_V17QgVFyEeOLNIKOajeerQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V17QglFyEeOLNIKOajeerQ"/> + </children> + <element xmi:type="uml:State" href="SampleOOTraceTest.uml#_66D8kDclEeKAhIrFXfR8zQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66VCUTclEeKAhIrFXfR8zQ" x="159" y="46" width="109" height="88"/> + </children> + <children xmi:type="notation:Shape" xmi:id="_9gPUoDclEeKAhIrFXfR8zQ" type="8000" fontName="Sans Serif" lineColor="0"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9gP7sTclEeKAhIrFXfR8zQ" source="ShadowFigure"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9gP7sjclEeKAhIrFXfR8zQ" key="ShadowFigure_Value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9gQiwDclEeKAhIrFXfR8zQ" source="displayNameLabelIcon"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9gQiwTclEeKAhIrFXfR8zQ" key="displayNameLabelIcon_value" value="false"/> + </eAnnotations> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9gQiwjclEeKAhIrFXfR8zQ" source="QualifiedName"> + <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9gQiwzclEeKAhIrFXfR8zQ" key="QualifiedNameDepth" value="1000"/> + </eAnnotations> + <children xmi:type="notation:DecorationNode" xmi:id="_9gQixDclEeKAhIrFXfR8zQ" type="8001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_9gQixTclEeKAhIrFXfR8zQ" x="26" y="-11"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_9gQixjclEeKAhIrFXfR8zQ" type="8002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_9gQixzclEeKAhIrFXfR8zQ" x="25" y="-10"/> + </children> + <element xmi:type="uml:Pseudostate" href="SampleOOTraceTest.uml#_9f6kgDclEeKAhIrFXfR8zQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9gP7sDclEeKAhIrFXfR8zQ" x="43" y="30"/> + </children> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwVTclEeKAhIrFXfR8zQ"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_V140QFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_V140QVFyEeOLNIKOajeerQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V140QlFyEeOLNIKOajeerQ"/> + </children> + <element xmi:type="uml:Region" href="SampleOOTraceTest.uml#_57WRkDclEeKAhIrFXfR8zQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwVjclEeKAhIrFXfR8zQ" width="592" height="245"/> + </children> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwVzclEeKAhIrFXfR8zQ" y="14" width="592" height="245"/> + </children> + <children xmi:type="notation:BasicCompartment" xmi:id="_V12YAFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display"> + <styles xmi:type="notation:TitleStyle" xmi:id="_V12YAVFyEeOLNIKOajeerQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V12YAlFyEeOLNIKOajeerQ"/> + </children> + <element xmi:type="uml:StateMachine" href="SampleOOTraceTest.uml#_5Vd9UDclEeKAhIrFXfR8zQ"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwWDclEeKAhIrFXfR8zQ" x="30" y="30" width="592" height="259"/> + </children> + <styles xmi:type="notation:DiagramStyle" xmi:id="_57mwWTclEeKAhIrFXfR8zQ"/> + <element xmi:type="uml:StateMachine" href="SampleOOTraceTest.uml#_5Vd9UDclEeKAhIrFXfR8zQ"/> + <edges xmi:type="notation:Connector" xmi:id="_8bHfoDclEeKAhIrFXfR8zQ" type="7000" source="_66VCUDclEeKAhIrFXfR8zQ" target="_66VCUDclEeKAhIrFXfR8zQ" smoothness="Normal" lineColor="0"> + <children xmi:type="notation:DecorationNode" xmi:id="_8bItwDclEeKAhIrFXfR8zQ" visible="false" type="7001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_8bItwTclEeKAhIrFXfR8zQ"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_8bItwjclEeKAhIrFXfR8zQ" visible="false" type="7002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_8bItwzclEeKAhIrFXfR8zQ"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_8bItxDclEeKAhIrFXfR8zQ" visible="false" type="7003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_8bItxTclEeKAhIrFXfR8zQ" y="60"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_8bHfoTclEeKAhIrFXfR8zQ" fontName="Sans Serif"/> + <element xmi:type="uml:Transition" href="SampleOOTraceTest.uml#_8ZB08DclEeKAhIrFXfR8zQ"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8bHfojclEeKAhIrFXfR8zQ" points="[3, 1, 40, -51]$[65, 34, 102, -18]$[56, 94, 93, 42]$[-7, 103, 30, 51]$[-35, 56, 2, 4]"/> + <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8b9NIDclEeKAhIrFXfR8zQ" id="(0.9724770642201835,0.36363636363636365)"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8b9NITclEeKAhIrFXfR8zQ" id="(0.6330275229357798,0.9545454545454546)"/> + </edges> + <edges xmi:type="notation:Connector" xmi:id="_-wO84DclEeKAhIrFXfR8zQ" type="7000" source="_9gPUoDclEeKAhIrFXfR8zQ" target="_66VCUDclEeKAhIrFXfR8zQ" lineColor="0"> + <children xmi:type="notation:DecorationNode" xmi:id="_-wPj8DclEeKAhIrFXfR8zQ" visible="false" type="7001"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_-wPj8TclEeKAhIrFXfR8zQ"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_-wQLADclEeKAhIrFXfR8zQ" visible="false" type="7002"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_-wQLATclEeKAhIrFXfR8zQ"/> + </children> + <children xmi:type="notation:DecorationNode" xmi:id="_-wQLAjclEeKAhIrFXfR8zQ" visible="false" type="7003"> + <layoutConstraint xmi:type="notation:Location" xmi:id="_-wQLAzclEeKAhIrFXfR8zQ" y="60"/> + </children> + <styles xmi:type="notation:FontStyle" xmi:id="_-wO84TclEeKAhIrFXfR8zQ" fontName="Sans Serif"/> + <element xmi:type="uml:Transition" href="SampleOOTraceTest.uml#_-v4XkDclEeKAhIrFXfR8zQ"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-wO84jclEeKAhIrFXfR8zQ" points="[10, 2, -77, -18]$[79, 14, -8, -6]"/> + <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-xGfkDclEeKAhIrFXfR8zQ" id="(0.07339449541284404,0.1590909090909091)"/> + </edges> + </notation:Diagram> +</xmi:XMI> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml new file mode 100644 index 00000000000..a0910ed1a3e --- /dev/null +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml @@ -0,0 +1,276 @@ +<?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:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" 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/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc"> + <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="SampleOOTraceTest"> + <packageImport xmi:type="uml:PackageImport" xmi:id="_O6TiITLUEd26WNosUASSSw"> + <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> + </packageImport> + <packageImport xmi:type="uml:PackageImport" xmi:id="_rwBsMP7AEd6Zw96O-tCw7A"> + <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/> + </packageImport> + <packageImport xmi:type="uml:PackageImport" xmi:id="__D5MwE2WEeGzNbfAXPgNLA"> + <importedPackage xmi:type="uml:Model" href="pathmap://QML_TRACE/tracing.uml#_H-ZqYDKeEd-WprEKTCaiMA"/> + </packageImport> + <packagedElement xmi:type="uml:Package" xmi:id="_OGM88DLaEd2qeKRLMdIx_A" name="Server"> + <packagedElement xmi:type="uml:Class" xmi:id="_oqZNUDLaEd2qeKRLMdIx_A" clientDependency="_YQqH0JYlEd6G9q9hwr11bw" name="Server_impl" classifierBehavior="_5Vd9UDclEeKAhIrFXfR8zQ"> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_xOQMoC7NEeOY-cM3M1mqKw" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xOzmQC7NEeOY-cM3M1mqKw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xO_zgC7NEeOY-cM3M1mqKw" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_xPLZsC7NEeOY-cM3M1mqKw" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xPuzUC7NEeOY-cM3M1mqKw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xP6ZgC7NEeOY-cM3M1mqKw" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_xQF_sC7NEeOY-cM3M1mqKw" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xQvf8C7NEeOY-cM3M1mqKw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xQ7GIC7NEeOY-cM3M1mqKw" value="1"/> + </ownedParameter> + <language>C/C++</language> + <body>cout << "a=" << a << " b=" << b << " a+b=" << a+b << endl; +return a+b;</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_I1R3YAcDEeGnrLqQ0OQeAg" name="mult" specification="_4ZEZwHecEd6r18stFZxmFQ"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_xRMy8C7NEeOY-cM3M1mqKw" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xRwzoC7NEeOY-cM3M1mqKw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xR8Z0C7NEeOY-cM3M1mqKw" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_xSInEC7NEeOY-cM3M1mqKw" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xStO0C7NEeOY-cM3M1mqKw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xS41AC7NEeOY-cM3M1mqKw" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_xTFCQC7NEeOY-cM3M1mqKw" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xTn00C7NEeOY-cM3M1mqKw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xT0CEC7NEeOY-cM3M1mqKw" value="1"/> + </ownedParameter> + <language>C/C++</language> + <body>cout << "a*b=" << a*b; +return a*b;</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_5Vd9UDclEeKAhIrFXfR8zQ" name="ServerStateMachine"> + <region xmi:type="uml:Region" xmi:id="_57WRkDclEeKAhIrFXfR8zQ" name="Region1"> + <transition xmi:type="uml:Transition" xmi:id="_8ZB08DclEeKAhIrFXfR8zQ" name="Transition0" source="_66D8kDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/> + <transition xmi:type="uml:Transition" xmi:id="_-v4XkDclEeKAhIrFXfR8zQ" name="Transition1" source="_9f6kgDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/> + <subvertex xmi:type="uml:State" xmi:id="_66D8kDclEeKAhIrFXfR8zQ" name="State0"/> + <subvertex xmi:type="uml:Pseudostate" xmi:id="_9f6kgDclEeKAhIrFXfR8zQ" name="Initial0"/> + </region> + </ownedBehavior> + <ownedOperation xmi:type="uml:Operation" xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_nvpKUDVdEeKoYLVLZgpRiw" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvup4DVdEeKoYLVLZgpRiw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvvQ8DVdEeKoYLVLZgpRiw" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_nvwfEDVdEeKoYLVLZgpRiw" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvy7UDVdEeKoYLVLZgpRiw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvziYDVdEeKoYLVLZgpRiw" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_nv1XkDVdEeKoYLVLZgpRiw" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nv3z0DVdEeKoYLVLZgpRiw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nv4a4DVdEeKoYLVLZgpRiw" value="1"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:type="uml:Operation" xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rrf74DVdEeKoYLVLZgpRiw" name="check"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_4UNv4DVdEeKoYLVLZgpRiw" name="write"> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4UO-ADVdEeKoYLVLZgpRiw" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4UPlEDVdEeKoYLVLZgpRiw" value="1"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:type="uml:Operation" xmi:id="_9OJPEDVkEeKoYLVLZgpRiw" name="testOp"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_Br-FQDVlEeKoYLVLZgpRiw" name="testPar"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:type="uml:Operation" xmi:id="_6ERa0DW2EeKyT6LlKoWJIA" name="length"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_FfLX4DW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FfN0IDW3EeKyT6LlKoWJIA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FfObMDW3EeKyT6LlKoWJIA" value="1"/> + </ownedParameter> + </ownedOperation> + </packagedElement> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_Tp4n8DLaEd2qeKRLMdIx_A" name="Interfaces"> + <ownedComment xmi:type="uml:Comment" xmi:id="_TDDBoDeEEeGPyrZ5I3hMlA" annotatedElement="_cn-H0DLbEd2qeKRLMdIx_A"> + <body>This interface contains services that are used by the client and provided by the server component</body> + </ownedComment> + <packagedElement xmi:type="uml:Interface" xmi:id="_cn-H0DLbEd2qeKRLMdIx_A" name="ICompute"> + <ownedOperation xmi:type="uml:Operation" xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:type="uml:Operation" xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/> + </ownedParameter> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:type="uml:Operation" xmi:id="_rrbqcDVdEeKoYLVLZgpRiw" name="check" isAbstract="true"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_0xTp0DVdEeKoYLVLZgpRiw" name="write"> + <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/> + </ownedParameter> + </ownedOperation> + <ownedOperation xmi:type="uml:Operation" xmi:id="_6DewoDW2EeKyT6LlKoWJIA" name="length"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_AP4BcDW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"/> + </ownedOperation> + </packagedElement> + <packagedElement xmi:type="uml:DataType" xmi:id="_krMkcDW2EeKyT6LlKoWJIA" name="Point"> + <ownedAttribute xmi:type="uml:Property" xmi:id="_m0WCQDW2EeKyT6LlKoWJIA" name="x" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pOAoUDW2EeKyT6LlKoWJIA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pOB2cDW2EeKyT6LlKoWJIA" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_pOESsDW2EeKyT6LlKoWJIA"> + <value xsi:nil="true"/> + </defaultValue> + </ownedAttribute> + <ownedAttribute xmi:type="uml:Property" xmi:id="_yJIJMDW2EeKyT6LlKoWJIA" name="y" visibility="public"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/> + <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yd44QDW2EeKyT6LlKoWJIA" value="1"/> + <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yd6GYDW2EeKyT6LlKoWJIA" value="1"/> + <defaultValue xmi:type="uml:LiteralString" xmi:id="_yd77kDW2EeKyT6LlKoWJIA"> + <value xsi:nil="true"/> + </defaultValue> + </ownedAttribute> + </packagedElement> + </packagedElement> + <packagedElement xmi:type="uml:Package" xmi:id="_etOZkDLaEd2qeKRLMdIx_A" name="Client"> + <ownedComment xmi:type="uml:Comment" xmi:id="_fBRcQDeGEeGPyrZ5I3hMlA" annotatedElement="_IfjoETLbEd2qeKRLMdIx_A"> + <body>The operation "run" (not the associated behavior) has been added automatically by Qompass in order to implement the operations of interfaces provided by ports, in this case of the operations of the "IStart" interface. It would be tedious to manually copy operations from an interface, as it would imply copying the complete signature with all parameters. The component developper has to provide a suitable behavior. A validation rule verifies if operations without behavior exist.</body> + </ownedComment> + <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_ZmdDkEdDEeGxo4rn9hBAOQ" name="Client_impl"> + <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_ZmdDkEdDEeGxo4rn9hBAOQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A"> + <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> + <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/> + </interfaceRealization> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_ZnGj0EdDEeGxo4rn9hBAOQ"> + <language>C/C++</language> + <body>cout << "call via port q: add (2, 3);" << endl; +for (int i=0; i<20; i++) { + cout << "result: " << q->add (2, (i+3)) << endl; + usleep((i+10)*5*1000); + cout << "result: " << q->mult (3.0, 7.0) << endl; + usleep(20*1000); + testOp(i*2); + usleep(30*1000); +}</body> + </ownedBehavior> + <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yVALQDclEeKAhIrFXfR8zQ" name="testOp" specification="_Qzp7gDclEeKAhIrFXfR8zQ"> + <language>C/C++</language> + <body>cout << "This is a test operation" << endl;</body> + </ownedBehavior> + <ownedOperation xmi:type="uml:Operation" xmi:id="_ZnGj0EdDEeGxo4rn9hBAOQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/> + <ownedOperation xmi:type="uml:Operation" xmi:id="_Qzp7gDclEeKAhIrFXfR8zQ" name="testOp" method="_yVALQDclEeKAhIrFXfR8zQ"> + <ownedParameter xmi:type="uml:Parameter" xmi:id="_rXu4UDc_EeKPle9CbXIcpQ" name="j"> + <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/> + </ownedParameter> + </ownedOperation> + </packagedElement> + </packagedElement> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_O6TiIjLUEd26WNosUASSSw"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_GcC0cAHtEd6HSdiss9GQ0A"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Gd1kMAHtEd6HSdiss9GQ0A" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_z1TwgFW3Ed63BrxiKsw-0Q"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z2GasFW3Ed63BrxiKsw-0Q" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/> + </profileApplication> + <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_1GtD8E0fEeG_H4ME7SR4KA"> + <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1RA2gE0fEeG_H4ME7SR4KA" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/> + </eAnnotations> + <appliedProfile xmi:type="uml:Profile" href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/> + </profileApplication> + </uml:Model> + <FCM:DerivedElement xmi:id="_B9o7sP6yEd6Ie_kieu_3CQ"> + <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> + </FCM:DerivedElement> + <FCM:DerivedElement xmi:id="_DWb6oP6yEd6Ie_kieu_3CQ" base_Element="_TbIjUJYlEd6G9q9hwr11bw" source="_DGs6wDLgEd28fJKJJnUaeQ"/> + <FCM:DerivedElement xmi:id="_DXK6cP6yEd6Ie_kieu_3CQ" base_Element="_4ZEZwHecEd6r18stFZxmFQ" source="_L8EY8DLgEd28fJKJJnUaeQ"/> + <FCM:RuleApplication xmi:id="_DWIYoP6yEd6Ie_kieu_3CQ" base_Class="_oqZNUDLaEd2qeKRLMdIx_A"> + <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/> + <propagateRule>false</propagateRule> + <interceptor href="pathmap://QML_TRACE/tracing.uml#_35od4DKrEd-z5o2wSoJ16A"/> + </FCM:RuleApplication> + <FCM:Connector xmi:id="_K2_iAP6yEd6Ie_kieu_3CQ"/> + <FCM:DerivedElement xmi:id="_RwGb8P6_Ed6Zw96O-tCw7A" source="_DGs6wDLgEd28fJKJJnUaeQ"/> + <FCM:DerivedElement xmi:id="_RxVyEP6_Ed6Zw96O-tCw7A" source="_L8EY8DLgEd28fJKJJnUaeQ"/> + <C_Cpp:Include xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include <unistd.h>
#include <iostream>
using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/> + <C_Cpp:Include xmi:id="_Sa4nEP77Ed6Zw96O-tCw7A" body="#include <iostream>
using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/> + <FCM:Connector xmi:id="_Tm9v0ACUEd-PD8FdFs7bpA"/> + <FCM:DeploymentPlan xmi:id="_lEueYGLEEd-seu3qyZgHfg"/> + <FCM:DeploymentPlan xmi:id="_u_ACgGSuEd-dQdK1-7wIFg"/> + <FCM:DeploymentPlan xmi:id="_YK67AGTgEd-rCOWJcspHOA"/> + <FCM:ContainerRule xmi:id="_lNrDwH4HEd-rD-b0gnx-AQ"/> + <FCM:Configuration xmi:id="_RM9kQH8UEd-7Bsdl4VhuEw" base_Package="_BJc50H8TEd-7Bsdl4VhuEw"> + <configOptions xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/> + </FCM:Configuration> + <FCM:DerivedElement xmi:id="_1E0nUKFhEd-AoOVE_odazw"/> + <FCM:Connector xmi:id="_cAkqIMKnEd-LE5cHpAvxBg"> + <connector xmi:type="FCM:ConnectorImplGroup" href="pathmap://QML_DISTRIBUTION/distribution.uml#_DBP7QMKmEd-hj59jYY3RZQ"/> + </FCM:Connector> + <FCM:DerivedElement xmi:id="_ZnZewEdDEeGxo4rn9hBAOQ" base_Element="_ZnGj0EdDEeGxo4rn9hBAOQ"> + <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/> + </FCM:DerivedElement> + <Alloc:Allocate xmi:id="_hgh4IE0rEeGl_syZE5iOXA"/> + <Alloc:Allocate xmi:id="_iwbZwE0rEeGl_syZE5iOXA"/> + <Alloc:Allocate xmi:id="_juiAwE0rEeGl_syZE5iOXA"/> + <FCM:DerivedElement xmi:id="_rrmpkDVdEeKoYLVLZgpRiw" base_Element="_rrf74DVdEeKoYLVLZgpRiw" source="_rrbqcDVdEeKoYLVLZgpRiw"/> + <FCM:DerivedElement xmi:id="_6EbL0DW2EeKyT6LlKoWJIA" base_Element="_6ERa0DW2EeKyT6LlKoWJIA" source="_6DewoDW2EeKyT6LlKoWJIA"/> + <FCM:RuleApplication xmi:id="__bC_ADcmEeKAhIrFXfR8zQ" base_Class="_IfjoETLbEd2qeKRLMdIx_A"> + <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/> + <propagateRule>false</propagateRule> + </FCM:RuleApplication> +</xmi:XMI> diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java index 44b716be54a..c3274d24415 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java @@ -6,6 +6,6 @@ import org.eclipse.papyrus.qompass.modellibs.core.ModelCopyWizard; public class ClientServerTraceTestModelWizard extends ModelCopyWizard { public ClientServerTraceTestModelWizard () { - modelName = "ClientServerTraceTest"; + modelName = "ClientServerTraceTest"; //$NON-NLS-1$ } } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java index 6dae4aa1244..48cf53a4695 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java @@ -13,10 +13,10 @@ import org.eclipse.uml2.uml.Property; public class IConfiguratorOTF implements IInstanceConfigurator { - static final String PROP_PORT_NAME = "portName"; - - static final String PROP_INSTANCE_NAME = "instanceName"; + static final String PROP_PORT_NAME = "portName"; //$NON-NLS-1$ + static final String PROP_INSTANCE_NAME = "instanceName"; //$NON-NLS-1$ + /** * Configure the passed trace instance * @@ -25,8 +25,8 @@ public class IConfiguratorOTF implements IInstanceConfigurator { public void configureInstance(InstanceSpecification instance, Property componentPart, ContainerContext context) { // The tracing code needs informations about the component instance and port. - DepPlanUtils.configureProperty(instance, PROP_INSTANCE_NAME, "\"" + instance.getName() + "\""); - + DepPlanUtils.configureProperty(instance, PROP_INSTANCE_NAME, StringConstants.QUOTE + instance.getName() + StringConstants.QUOTE); + // port in context => interception of port => provide information about port and interface if(context.port != null) { // obtain required or provided interface (TODO: will fail, if both are provided!) @@ -35,15 +35,15 @@ public class IConfiguratorOTF implements IInstanceConfigurator { intf = PortUtils.getRequired(context.port); } - DepPlanUtils.configureProperty(instance, PROP_PORT_NAME, "\"" + context.port.getName() + "\""); + DepPlanUtils.configureProperty(instance, PROP_PORT_NAME, StringConstants.QUOTE + context.port.getName() + StringConstants.QUOTE); if(intf != null) { // this is specific for OTF: // each container contains an attribute (id_<name>) for each operation. This is configured here, // since we add instance information to the trace (is that useful??, seems like a hack) for(Operation op : intf.getOperations()) { - String id = Utils.getTop(context.executorIS).getName() + "::Tracing::Trace::ID_" + - context.executorIS.getName().replace(".", "_") + "_" + op.getName(); - DepPlanUtils.configureProperty(instance, "id_" + op.getName(), id); + String id = Utils.getTop(context.executorIS).getName() + "::Tracing::Trace::ID_" + //$NON-NLS-1$ + context.executorIS.getName().replace(".", "_") + "_" + op.getName(); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + DepPlanUtils.configureProperty(instance, "id_" + op.getName(), id); //$NON-NLS-1$ } } } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java index 7c76623710f..43de8b800c1 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java @@ -30,11 +30,11 @@ public class IConfiguratorTrace implements IInstanceConfigurator { } } - DepPlanUtils.configureProperty(instance, PROP_INSTANCE_NAME, "\"" + instanceName + "\""); + DepPlanUtils.configureProperty(instance, PROP_INSTANCE_NAME, StringConstants.QUOTE + instanceName + StringConstants.QUOTE); // port in context => interception of port => provide information about port and interface if(context.port != null) { - DepPlanUtils.configureProperty(instance, PROP_PORT_NAME, "\"" + context.port.getName() + "\""); + DepPlanUtils.configureProperty(instance, PROP_PORT_NAME, StringConstants.QUOTE + context.port.getName() + StringConstants.QUOTE); } } } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java index e9593ba3cd2..e3e0ca8da86 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java @@ -23,8 +23,8 @@ import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation; import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants; import org.eclipse.papyrus.qompass.designer.core.Description; import org.eclipse.papyrus.qompass.designer.core.Log; -import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.papyrus.qompass.designer.core.Utils; +import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.NamedElement; @@ -34,7 +34,7 @@ import org.eclipse.uml2.uml.Property; public class QompassTraceMechanism implements ITraceMechanism { - public static final String EC3M_TRACING_URI = "pathmap://QML_TRACE/tracing.uml"; + public static final String EC3M_TRACING_URI = "pathmap://QML_TRACE/tracing.uml"; //$NON-NLS-1$ public static final URI tracingURI = URI.createURI(EC3M_TRACING_URI); @@ -104,7 +104,7 @@ public class QompassTraceMechanism implements ITraceMechanism { public boolean isForTracing(ContainerRule rule) { for(ConfigOption co : rule.getForConfig()) { // TODO: not very clean to used fixed string - if(co.getBase_Class().getName().equals("Trace")) { + if(co.getBase_Class().getName().equals("Trace")) { //$NON-NLS-1$ return true; } } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java new file mode 100644 index 00000000000..171fece98a4 --- /dev/null +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java @@ -0,0 +1,6 @@ +package org.eclipse.papyrus.qompass.modellibs.tracing; + +public class StringConstants { + public static final String QUOTE = "\""; //$NON-NLS-1$ + +} diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl index af7a3358147..cdddfb7314a 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl @@ -112,7 +112,7 @@ tracepoint([tpName1()/], [operation.tpName2()/], instanceName[if (operation.para [/template] -[template flattenParNameAndType(parameter : Parameter) post(trim())] +[template public flattenParNameAndType(parameter : Parameter) post(trim())] [if (type.oclIsTypeOf(DataType))] [for (attribute : Property | type.oclAsType(DataType).attribute) separator(', ')][attribute.type.cppTypeWB()/], [parameter.name + '_' + attribute.name/][/for] [else] @@ -120,7 +120,7 @@ tracepoint([tpName1()/], [operation.tpName2()/], instanceName[if (operation.para [/if] [/template] -[template flattenParName(parameter : Parameter) post(trim())] +[template public flattenParName(parameter : Parameter) post(trim())] [if (type.oclIsTypeOf(DataType))] [for (attribute : Property | type.oclAsType(DataType).attribute) separator(', ')][parameter.name + '.' + attribute.name/][/for] [else] @@ -129,7 +129,7 @@ tracepoint([tpName1()/], [operation.tpName2()/], instanceName[if (operation.para [/template] -[template flattenCtfType(type : Type, name : String) post(trim())] +[template public flattenCtfType(type : Type, name : String) post(trim())] [if (type.oclIsTypeOf(DataType))] [for (attribute : Property | type.oclAsType(DataType).attribute) separator('\n')][ctfType(attribute.type, name + '_' + attribute.name)/][/for] [else] @@ -138,7 +138,7 @@ tracepoint([tpName1()/], [operation.tpName2()/], instanceName[if (operation.para [/template] -[template cppTypeWB(type : Type) post(trim())] +[template public cppTypeWB(type : Type) post(trim())] [if (type.qualifiedName = 'UMLPrimitiveTypes::Boolean') or (type.qualifiedName = 'PrimitiveTypes::Boolean') or diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java index 1455bc22b1b..fd5f20c6e87 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java @@ -17,7 +17,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart; @@ -60,13 +60,13 @@ public class ComponentPreferencePage extends ArchitectureDiagramNodePreferencePa // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java index 5eb0ed20981..05ea323b1a4 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java @@ -13,7 +13,7 @@ package org.eclipse.papyrus.robotml.diagram.architecture.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart; public class PortPreferencePage extends ArchitectureDiagramNodePreferencePage { @@ -27,8 +27,8 @@ public class PortPreferencePage extends ArchitectureDiagramNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java index 2db78022737..90050e87235 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java @@ -13,7 +13,7 @@ package org.eclipse.papyrus.robotml.diagram.architecture.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart; public class PropertyPreferencePage extends ArchitectureDiagramNodePreferencePage { @@ -33,7 +33,7 @@ public class PropertyPreferencePage extends ArchitectureDiagramNodePreferencePag public static void initDefaults(IPreferenceStore store) { // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java index 068bf2349a2..8971a69387a 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ClassPreferencePage.java @@ -16,7 +16,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart; public class ClassPreferencePage extends ComponentdefDiagramNodePreferencePage { @@ -59,13 +59,13 @@ public class ClassPreferencePage extends ComponentdefDiagramNodePreferencePage { // set the true value for the compartment visibility // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java index 9f133047ced..ab4dac5b8ee 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/ComponentPreferencePage.java @@ -16,7 +16,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart; @@ -59,13 +59,13 @@ public class ComponentPreferencePage extends ComponentdefDiagramNodePreferencePa // Initialize default visibility for compartments in preference page. for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) { - String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String showCompartmentKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName)); } // Initialize default title visibility for compartments in preference page. for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) { - String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); + String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName)); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java index 9bf364bed4b..cf7a560c739 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PackagePreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.componentdef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart; public class PackagePreferencePage extends ComponentdefDiagramNodePreferencePage { @@ -30,11 +30,11 @@ public class PackagePreferencePage extends ComponentdefDiagramNodePreferencePage } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java index 54e9c630c08..1b690d02dfe 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PortPreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.componentdef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart; public class PortPreferencePage extends ComponentdefDiagramNodePreferencePage { @@ -26,8 +26,8 @@ public class PortPreferencePage extends ComponentdefDiagramNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java index 007277ea548..2394468a886 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.componentdef/src-gen/org/eclipse/papyrus/robotml/diagram/componentdef/preferences/PropertyPreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.componentdef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.componentdef.edit.part.ComponentdefDiagramEditPart; public class PropertyPreferencePage extends ComponentdefDiagramNodePreferencePage { @@ -32,7 +32,7 @@ public class PropertyPreferencePage extends ComponentdefDiagramNodePreferencePag public static void initDefaults(IPreferenceStore store) { // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java index d2a3402cf9b..c52d20a4966 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart; public class DataTypePreferencePage extends DatatypeDefNodePreferencePage { @@ -30,11 +30,11 @@ public class DataTypePreferencePage extends DatatypeDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java index 3603b07aed4..9f2781b2caf 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart; public class DiagramPreferencePage extends DatatypeDefNodePreferencePage { @@ -26,8 +26,8 @@ public class DiagramPreferencePage extends DatatypeDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java index a96e76aafdc..e1bd4d08e50 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart; public class EnumerationPreferencePage extends DatatypeDefNodePreferencePage { @@ -30,11 +30,11 @@ public class EnumerationPreferencePage extends DatatypeDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java index d05f4685127..8fd621a0b79 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart; public class PackagePreferencePage extends DatatypeDefNodePreferencePage { @@ -30,11 +30,11 @@ public class PackagePreferencePage extends DatatypeDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java index 59639db2f83..144dbf82999 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart; public class PrimitiveTypePreferencePage extends DatatypeDefNodePreferencePage { @@ -26,8 +26,8 @@ public class PrimitiveTypePreferencePage extends DatatypeDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 50); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 50); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java index d4ae3502f51..7a3dc0e8a94 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart; public class SignalPreferencePage extends DatatypeDefNodePreferencePage { @@ -30,11 +30,11 @@ public class SignalPreferencePage extends DatatypeDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java index a928721b41b..d5ff1b1b0de 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart; public class DiagramPreferencePage extends InterfaceDefNodePreferencePage { @@ -26,8 +26,8 @@ public class DiagramPreferencePage extends InterfaceDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java index 6976094db28..418ace190c6 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart; public class InterfacePreferencePage extends InterfaceDefNodePreferencePage { @@ -30,11 +30,11 @@ public class InterfacePreferencePage extends InterfaceDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java index 82759960cfa..36b92ad4487 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java @@ -12,7 +12,7 @@ package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart; public class PackagePreferencePage extends InterfaceDefNodePreferencePage { @@ -30,11 +30,11 @@ public class PackagePreferencePage extends InterfaceDefNodePreferencePage { } public static void initDefaults(IPreferenceStore store) { - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200); - store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200); + store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100); // set the true value for the compartment visibility for(String name : compartments) { - String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); + String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); store.setDefault(preferenceName, true); } } |