diff --git a/pom.xml b/pom.xml index 61340bf..d0e487a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.modelio.module variabilitydesigner - 1.3.01 + 1.4.00 VariabilityDesigner @@ -31,7 +31,7 @@ org.modelio MDAKit - [4.0.0,4.0.1) + [4.1.0,4.2.0) pom provided @@ -57,7 +57,7 @@ org.modelio modelio-maven-plugin - 4.0.0.00 + 4.1.0.00 ModuleValidation @@ -181,7 +181,7 @@ modelio-maven-plugin - [4.0.0.00,) + [4.1.0.00,) diff --git a/src/main/conf/module.xml b/src/main/conf/module.xml index ef90c79..ae2b931 100644 --- a/src/main/conf/module.xml +++ b/src/main/conf/module.xml @@ -1,5 +1,5 @@ - + @@ -205,6 +205,12 @@ + + + + + + @@ -447,7 +453,9 @@ - + + + diff --git a/src/main/conf/module_fr.properties b/src/main/conf/module_fr.properties index f18773a..61148fe 100644 --- a/src/main/conf/module_fr.properties +++ b/src/main/conf/module_fr.properties @@ -1,6 +1,8 @@ ModuleDescription=Variability Designer is a Modelio Module that allows Modelio users to manage variability on UML/SysML models. It allows to create 150% Models and generate variant model based on VEL configuration file. ModuleLabel=VariabilityDesigner +command.Add_Variation_Point.label=Add_Variation_Point +command.Add_Variation_Point.tooltip= command.Check_Conformance.label=Check Conformance command.Check_Conformance.tooltip= command.Feature_Diagram.label=Feature Diagram diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/IVariabilityDesignerPeerModule.java b/src/main/java/org/modelio/module/variabilitydesigner/api/IVariabilityDesignerPeerModule.java index 97b0b8f..18f0140 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/IVariabilityDesignerPeerModule.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/IVariabilityDesignerPeerModule.java @@ -1,11 +1,8 @@ package org.modelio.module.variabilitydesigner.api; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.IPeerModule; -@objid ("ab841c5e-fa06-49be-82cc-17936b3b40fd") public interface IVariabilityDesignerPeerModule extends IPeerModule { - @objid ("f8e6ce16-1bc1-480e-a5c4-daee0fa6dd1e") public static final String MODULE_NAME = "VariabilityDesigner"; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerParameters.java b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerParameters.java index 4f785af..cea6b59 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerParameters.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerParameters.java @@ -1,7 +1,5 @@ package org.modelio.module.variabilitydesigner.api; -import com.modeliosoft.modelio.javadesigner.annotations.objid; -@objid ("0f939752-1bdc-4b81-b540-089ed95c42e2") public interface VariabilityDesignerParameters { } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerProxyFactory.java b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerProxyFactory.java index 3f6d8f3..6a381f2 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerProxyFactory.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerProxyFactory.java @@ -6,7 +6,6 @@ */ package org.modelio.module.variabilitydesigner.api; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.metamodel.diagrams.AbstractDiagram; import org.modelio.metamodel.diagrams.ActivityDiagram; import org.modelio.metamodel.diagrams.ClassDiagram; @@ -59,9 +58,7 @@ *
  • << VariantDefinition >> on a {@link org.modelio.metamodel.uml.infrastructure.matrix.MatrixDefinition}: instantiates a {@link VariantDefinition} * */ -@objid ("5e4a94b1-36a9-4416-9022-28198dad8e79") public class VariabilityDesignerProxyFactory { - @objid ("f3bb5a7d-6f86-4533-9976-e5f7838c9013") private static final InstantiateVisitor instantiateVisitor = new InstantiateVisitor(); /** @@ -69,11 +66,9 @@ public class VariabilityDesignerProxyFactory { *
    The model element must be stereotyped by a 'VariabilityDesigner' module stereotype. *
    In the other case the method will return null. * - * * @param e A model element * @return the right proxy or null. */ - @objid ("a5c436b8-efd7-48ad-9ebf-0742e88d2261") public static final Object instantiate(final ModelElement e) { for (Stereotype s : e.getExtension()) { ModuleComponent module = s.getModule(); @@ -89,200 +84,169 @@ public static final Object instantiate(final ModelElement e) { * The stereotype must be one of the 'VariabilityDesigner' module stereotypes. * In the other case the method will return null. * - * * @param e A model element. * @param stName A stereotype name. * @return the right proxy or null. */ - @objid ("4df7b4bd-561b-421e-bb0b-096ccc0c27a1") public static final Object instantiate(final Element e, final String stName) { instantiateVisitor.setStereotype(stName); return e.accept(instantiateVisitor); } - @objid ("e4794c69-2d98-49f4-9906-8936ac704c50") private static class InstantiateVisitor implements IDefaultModelVisitor, IDefaultInfrastructureVisitor { - @objid ("11516447-a7be-4949-bd6a-9034ae5fecc0") private String stName; - @objid ("34c340ea-1650-469e-a07c-09636c34d61e") public final void setStereotype(final String stName) { this.stName = stName; } - @objid ("7dcd0fe8-5367-4245-b95b-70167b2c4558") @Override public final Object visitAbstractDiagram(AbstractDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.infrastructure.abstractdiagram.VariationDiagram.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.infrastructure.abstractdiagram.VariationDiagram.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.infrastructure.abstractdiagram.VariationDiagram.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.infrastructure.abstractdiagram.VariationDiagram.instantiate(obj); + default: + break; } - return IDefaultInfrastructureVisitor.super.visitAbstractDiagram(obj); } - @objid ("71ad3420-0f58-47b8-a8a9-642f7fb6c37e") @Override public final Object visitStateMachineDiagram(StateMachineDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.standard.statemachinediagram.StateMachineDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.statemachinediagram.StateMachineDiagramVariability.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.standard.statemachinediagram.StateMachineDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.statemachinediagram.StateMachineDiagramVariability.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitStateMachineDiagram(obj); } - @objid ("2b3bbf45-a202-4081-aa22-2d79c1ffbc6c") @Override public final Object visitClassDiagram(ClassDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.standard.classdiagram.ClassDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.classdiagram.ClassDiagramVariability.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.automatic.standard.classdiagram.FeatureDiagram.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.classdiagram.FeatureDiagram.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.standard.classdiagram.ClassDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.classdiagram.ClassDiagramVariability.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.automatic.standard.classdiagram.FeatureDiagram.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.classdiagram.FeatureDiagram.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitClassDiagram(obj); } - @objid ("45cf8af7-5d85-4ae0-96bc-039461fa8159") @Override public final Object visitPackage(Package obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.projectsetup.standard.package_.Model150.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.projectsetup.standard.package_.Model150.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.feature.standard.package_.FeatureModel.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.package_.FeatureModel.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.projectsetup.standard.package_.Model150.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.projectsetup.standard.package_.Model150.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.feature.standard.package_.FeatureModel.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.package_.FeatureModel.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitPackage(obj); } - @objid ("783c74f6-8f38-4d2d-b6c4-2fbc77d82044") @Override public final Object visitMatrixDefinition(MatrixDefinition obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.feature.infrastructure.matrixdefinition.VariantDefinition.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.infrastructure.matrixdefinition.VariantDefinition.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.feature.infrastructure.matrixdefinition.VariantDefinition.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.infrastructure.matrixdefinition.VariantDefinition.instantiate(obj); + default: + break; } - return IDefaultInfrastructureVisitor.super.visitMatrixDefinition(obj); } - @objid ("9aac3cf8-e79e-4969-99fc-275e4899046d") @Override public final Object visitObjectDiagram(ObjectDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.standard.objectdiagram.ObjectDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.objectdiagram.ObjectDiagramVariability.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.standard.objectdiagram.ObjectDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.objectdiagram.ObjectDiagramVariability.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitObjectDiagram(obj); } - @objid ("4aafe765-894c-4ad8-8560-4e8c9f064cb1") @Override public final Object visitActivityDiagram(ActivityDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.standard.activitydiagram.ActivityDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.activitydiagram.ActivityDiagramVariability.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.standard.activitydiagram.ActivityDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.activitydiagram.ActivityDiagramVariability.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitActivityDiagram(obj); } - @objid ("d4ab5a15-9131-44d7-9cee-0917f2b2c7a6") @Override public final Object visitSequenceDiagram(SequenceDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.standard.sequencediagram.SequenceDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.sequencediagram.SequenceDiagramVariability.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.standard.sequencediagram.SequenceDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.sequencediagram.SequenceDiagramVariability.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitSequenceDiagram(obj); } - @objid ("a373bb3a-4cb6-4ffb-abb8-9d3285521b0f") @Override public final Object visitClass(Class obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.feature.standard.class_.FeatureRoot.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.FeatureRoot.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.feature.standard.class_.Feature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.Feature.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.feature.standard.class_.MandatoryFeature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.MandatoryFeature.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.feature.standard.class_.OptionalFeature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.OptionalFeature.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.feature.standard.class_.AlternativeFeature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.AlternativeFeature.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.feature.standard.class_.OrFeature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.OrFeature.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.feature.standard.class_.Variant.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.Variant.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.feature.standard.class_.FeatureRoot.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.FeatureRoot.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.feature.standard.class_.Feature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.Feature.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.feature.standard.class_.MandatoryFeature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.MandatoryFeature.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.feature.standard.class_.OptionalFeature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.OptionalFeature.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.feature.standard.class_.AlternativeFeature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.AlternativeFeature.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.feature.standard.class_.OrFeature.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.OrFeature.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.feature.standard.class_.Variant.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.feature.standard.class_.Variant.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitClass(obj); } - @objid ("d360b779-3d88-4f9a-9b2a-5b467d5c03e0") @Override public final Object visitConstraint(Constraint obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.variation.standard.constraint.OptionalStructuralVariation.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.variation.standard.constraint.OptionalStructuralVariation.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.variation.standard.constraint.AlternativeStructuralVariation.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.variation.standard.constraint.AlternativeStructuralVariation.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.variation.standard.constraint.CalculatedParameterVariation.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.variation.standard.constraint.CalculatedParameterVariation.instantiate(obj); - case org.modelio.module.variabilitydesigner.api.variation.standard.constraint.AlternativeParameterVariation.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.variation.standard.constraint.AlternativeParameterVariation.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.variation.standard.constraint.OptionalStructuralVariation.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.variation.standard.constraint.OptionalStructuralVariation.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.variation.standard.constraint.AlternativeStructuralVariation.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.variation.standard.constraint.AlternativeStructuralVariation.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.variation.standard.constraint.CalculatedParameterVariation.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.variation.standard.constraint.CalculatedParameterVariation.instantiate(obj); + case org.modelio.module.variabilitydesigner.api.variation.standard.constraint.AlternativeParameterVariation.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.variation.standard.constraint.AlternativeParameterVariation.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitConstraint(obj); } - @objid ("0575b6df-cd58-4b74-ba8b-ee988b9eecbe") @Override public final Object visitCommunicationDiagram(CommunicationDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.standard.communicationdiagram.CommunicationDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.communicationdiagram.CommunicationDiagramVariability.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.standard.communicationdiagram.CommunicationDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.communicationdiagram.CommunicationDiagramVariability.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitCommunicationDiagram(obj); } - @objid ("21e2aaac-5ecd-4f00-a1df-244c4adee77f") @Override public final Object visitUseCaseDiagram(UseCaseDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.standard.usecasediagram.UseCaseDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.usecasediagram.UseCaseDiagramVariability.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.standard.usecasediagram.UseCaseDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.usecasediagram.UseCaseDiagramVariability.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitUseCaseDiagram(obj); } - @objid ("708f8eb1-ec22-4e2c-91dd-862011d2ef42") @Override public final Object visitDeploymentDiagram(DeploymentDiagram obj) { switch (this.stName) { - case org.modelio.module.variabilitydesigner.api.automatic.standard.deploymentdiagram.DeploymentDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.deploymentdiagram.DeploymentDiagramVariability.instantiate(obj); - default: - break; + case org.modelio.module.variabilitydesigner.api.automatic.standard.deploymentdiagram.DeploymentDiagramVariability.STEREOTYPE_NAME: return org.modelio.module.variabilitydesigner.api.automatic.standard.deploymentdiagram.DeploymentDiagramVariability.instantiate(obj); + default: + break; } - return IDefaultModelVisitor.super.visitDeploymentDiagram(obj); } /** * Get the visitor to delegate to when a {@link IInfrastructureVisitor} is needed. *

    If null is returned the caller will return null. + * * @return the {@link IInfrastructureVisitor} visitor or null. */ - @objid ("2b8f386e-6d2c-452e-8991-66667013e794") @Override public IInfrastructureVisitor getInfrastructureVisitor() { return this; diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerStereotypes.java b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerStereotypes.java index 4e2b09d..2107817 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerStereotypes.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerStereotypes.java @@ -1,135 +1,102 @@ package org.modelio.module.variabilitydesigner.api; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.metamodel.diagrams.AbstractDiagram; import org.modelio.metamodel.uml.infrastructure.Constraint; import org.modelio.metamodel.uml.statik.Package; import org.modelio.module.variabilitydesigner.impl.VariabilityDesignerPeerModule; -@objid ("30d75aab-a6c3-456d-9397-e0ab94643ac3") public final class VariabilityDesignerStereotypes { - @objid ("5a0339a7-ff20-4e69-9396-96af6b9b644f") public static final String VARIATION = "Variation"; - @objid ("eeb0ace0-5418-4af2-b3c8-21b286ac1464") public static final String OPTIONAL_STRUCTURAL = "Optional_Structural_Variation"; - @objid ("88da51c5-7a60-476e-af80-6ed009a8a0bb") public static final String AlTERNATIVE_STRUCTURAL = "Alternative_Structural_Variation"; - @objid ("23d24ac7-bd6c-45d0-963d-8623883ae9ff") public static final String CALCULATED_PARAMETER = "Calculated_Parameter_Variation"; - @objid ("8a014805-9265-4f59-931f-5930bf3846c5") public static final String ALTERNATIVE_PARAMETER = "Alternative_Parameter_Variation"; - @objid ("32c45bc3-1936-46a8-adfe-4e226eab7ea4") public static final String VARIATION_CLASS_DIAGRAM = "Class_Diagram_(Variability)"; - @objid ("3e10ad7a-a59c-4103-984c-7cf906472f2c") public static final String VARIATION_MODEL_ROOT = "150%_model_root"; - @objid ("1f2e77e5-e5e5-4d51-97e9-3c53b7efa102") public static final String VARIATION_ACTIVITY_DIAGRAM = "Activity_Diagram_(Variability)"; - @objid ("d6a37699-9f6c-49f0-bb49-09177cc4d19c") public static final String VARIATION_COMMUNICATION_DIAGRAM = "Communication_Diagram_(Variability)"; - @objid ("eff9f022-f610-4beb-b8f4-735f3c53db56") public static final String VARIATION_DEPLOYMENT_DIAGRAM = "Deployment_Diagram_(Variability)"; - @objid ("86c179b7-6678-4eaa-9b35-bbb94f810085") public static final String VARIATION_OBJECT_DIAGRAM = "Object_Diagram_(Variability)"; - @objid ("f0c6f601-b408-4c12-b2a7-2aba20cfa3af") public static final String VARIATION_SEQUENCE_DIAGRAM = "Sequence_Diagram_(Variability)"; - @objid ("d6ae3d58-1756-4051-8b25-b789efb188f4") public static final String VARIATION_STATE_DIAGRAM = "State_Machine_Diagram_(Variability)"; - @objid ("cf7092e3-e68b-485b-bed9-e0a4df684890") public static final String VARIATION_USECASE_DIAGRAM = "Use_Case_Diagram_(Variability)"; - @objid ("4985f067-5b86-4125-9c9d-5ad78e9bc372") public static final String VARIATION_DIAGRAM = "Variation_Diagram"; //------------------------------------// - @objid ("c1423256-36e4-4cb6-9054-3dc538c1a9ec") public static final boolean isVariation(Constraint element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION); } - @objid ("1745bf75-869e-4047-b0cb-70ca5b081638") public static final boolean isOptionalStructuralVariation(Constraint element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME, OPTIONAL_STRUCTURAL); } - @objid ("0946e4b9-1d5d-47d3-bfff-acb3933ccf79") public static final boolean isXorStructuralVariation(Constraint element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME, AlTERNATIVE_STRUCTURAL); } - @objid ("7e84a924-3dbc-4abe-a676-3829b6315ed5") public static final boolean isCalculatedParameterVariation(Constraint element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME, CALCULATED_PARAMETER); } - @objid ("cb1974ff-1d22-496b-b235-a4c081cb16b9") public static final boolean isXorParameterVariation(Constraint element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME, ALTERNATIVE_PARAMETER); } - @objid ("80d57426-be15-4aa4-8464-30da5dc5e1da") public static final boolean isVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION_DIAGRAM); } - @objid ("cbc3195f-d613-46ed-ba5a-5f37e2ed1f2f") public static final boolean isVariationModelRoot(Package element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION_MODEL_ROOT); } - @objid ("4d8b99a4-f997-4302-a3a2-31ab77f7085e") public static final boolean isClassVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_CLASS_DIAGRAM); } - @objid ("ed80b81b-6a64-4977-b107-09145e2c8566") public static final boolean isActivityVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_ACTIVITY_DIAGRAM); } - @objid ("034790f6-8136-49ae-8a72-633f879b976c") public static final boolean isCommunicationVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_COMMUNICATION_DIAGRAM); } - @objid ("47941c3f-b476-4266-b2ba-3efcfa6fdab6") public static final boolean isDeploymentVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_DEPLOYMENT_DIAGRAM); } - @objid ("b8d381be-c222-4c06-8c16-5c643ac65e38") public static final boolean isObjectVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_OBJECT_DIAGRAM); } - @objid ("d66dec7c-af05-4d26-915d-8fc0d7aef4bf") public static final boolean isSequenceVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_SEQUENCE_DIAGRAM); } - @objid ("1e8277f4-b9b9-45cf-9ed0-4d9ebb15fa25") public static final boolean isStateVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_STATE_DIAGRAM); } - @objid ("9319a530-6336-48f4-b8d2-84b46171029d") public static final boolean isUseCaseVariationDiagram(AbstractDiagram element) { return element.isStereotyped(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_USECASE_DIAGRAM); } - @objid ("976a3420-876e-4b27-bbf9-52efc2cd60e6") public static final void removeVariationDiagramStereotype(AbstractDiagram element) { element.removeStereotypes(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_CLASS_DIAGRAM); element.removeStereotypes(VariabilityDesignerPeerModule.MODULE_NAME,VARIATION_ACTIVITY_DIAGRAM); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerTagTypes.java b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerTagTypes.java index 0d50373..c2eacbb 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerTagTypes.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/VariabilityDesignerTagTypes.java @@ -1,56 +1,42 @@ package org.modelio.module.variabilitydesigner.api; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.metamodel.uml.infrastructure.Constraint; import org.modelio.module.variabilitydesigner.impl.VariabilityDesignerPeerModule; -@objid ("958f8595-820a-4a83-a5cb-60bbac419e53") public class VariabilityDesignerTagTypes { - @objid ("e5abe5b6-151d-4666-b404-566ff870293c") public static final String VARIATION_POINT_ID = "Variation_Point_ID"; - @objid ("fbf2c883-ebac-4404-8033-b6aac00a7eec") public static final String VARIATION_EXPRESSION_TYPE = "Type"; - @objid ("b7563441-bb8d-47ae-bef0-2d5a11727562") public static final String VARIATION_EXPRESSION_VALUE = "Expression"; - @objid ("62e0575f-fcbd-4ca7-af84-2bc315c3c986") public static final String VARIATION_CONDITION_VALUE = "Condition"; - @objid ("3fcd6644-b64f-4bd9-87e3-c6cc73e7c38d") public static final String VARIATION_VALUE = "Value"; - @objid ("b9b90d8c-61ac-4bbb-9697-7613e0f8f6ee") public static final String VARIATION_APPLIED_ON = "Applied_on"; //------------------------------------// - @objid ("2e6b0492-f700-4190-84de-83b386499598") public static final String getVariationPointID(Constraint element) { return element.getTagValue(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION_POINT_ID); } - @objid ("cb42053b-c0e2-4a8f-8afb-160ad5731661") public static final String getVariationExpressionType(Constraint element) { return element.getTagValue(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION_EXPRESSION_TYPE); } - @objid ("de5faa04-29ef-4565-9892-d87a24a7f405") public static final String getVariationExpressionValue(Constraint element) { return element.getTagValue(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION_EXPRESSION_VALUE); } - @objid ("36151b76-6d96-484c-85f9-5bfb9d4f9227") public static final String getVariationConditionValue(Constraint element) { return element.getTagValue(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION_CONDITION_VALUE); } - @objid ("e9f9f796-cf18-4735-b582-2a7b39cbd9bb") public static final String getVariationValue(Constraint element) { return element.getTagValue(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION_VALUE); } - @objid ("ab68eb9d-e0b0-4de6-b122-3e9a4dea4150") public static final String getVariationAppliedOn(Constraint element) { return element.getTagValue(VariabilityDesignerPeerModule.MODULE_NAME, VARIATION_APPLIED_ON); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/infrastructure/abstractdiagram/VariationDiagram.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/infrastructure/abstractdiagram/VariationDiagram.java index 11e9e59..cfda6d2 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/infrastructure/abstractdiagram/VariationDiagram.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/infrastructure/abstractdiagram/VariationDiagram.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,15 +30,12 @@ *

    Stereotype description: *

    */ -@objid ("6e9f4b6e-ff23-4a7c-a9fd-0fbac2d40405") public class VariationDiagram { - @objid ("a0e7e26d-c985-4108-9f46-457df1649261") public static final String STEREOTYPE_NAME = "Variation_Diagram"; /** * The underlying {@link AbstractDiagram} represented by this proxy, never null. */ - @objid ("2a40b292-171b-47da-a81f-779132299dd6") protected final AbstractDiagram elt; /** @@ -50,7 +46,6 @@ public class VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("e71067ea-91e7-4509-8a2f-f45a9f7c5360") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof AbstractDiagram) && ((AbstractDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, VariationDiagram.STEREOTYPE_NAME)); } @@ -60,7 +55,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link VariationDiagram} proxy on the created {@link AbstractDiagram}. */ - @objid ("3fa69d15-c9c2-4578-91e7-594ae8c36f4b") public static VariationDiagram create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Infrastructure.AbstractDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, VariationDiagram.STEREOTYPE_NAME); @@ -68,34 +62,33 @@ public static VariationDiagram create() { } /** - * Tries to instantiate a {@link VariationDiagram} proxy from a {@link AbstractDiagram} stereotyped << Variation_Diagram >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link VariationDiagram} proxy from a {@link AbstractDiagram} stereotyped << Variation_Diagram >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a AbstractDiagram * @return a {@link VariationDiagram} proxy or null. */ - @objid ("17a8e3bc-6e01-451d-bd93-51eeddd46645") public static VariationDiagram instantiate(final AbstractDiagram obj) { return VariationDiagram.canInstantiate(obj) ? new VariationDiagram(obj) : null; } /** - * Tries to instantiate a {@link VariationDiagram} proxy from a {@link AbstractDiagram} stereotyped << Variation_Diagram >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link VariationDiagram} proxy from a {@link AbstractDiagram} stereotyped << Variation_Diagram >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link AbstractDiagram} * @return a {@link VariationDiagram} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("b9ce12a2-7a85-4e09-a3bb-f7693dabe240") public static VariationDiagram safeInstantiate(final AbstractDiagram obj) throws IllegalArgumentException { if (VariationDiagram.canInstantiate(obj)) - return new VariationDiagram(obj); + return new VariationDiagram(obj); else - throw new IllegalArgumentException("VariationDiagram: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("VariationDiagram: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("5595b490-d6bd-4ec0-923a-e360dcdbb77e") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -112,37 +105,30 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link AbstractDiagram}. + * Get the underlying {@link AbstractDiagram}. + * * @return the AbstractDiagram represented by this proxy, never null. */ - @objid ("58954ffe-562d-4589-855d-5da515ab728f") public AbstractDiagram getElement() { return this.elt; } - @objid ("95145801-5d46-442c-8b5b-3d0d4d6f36b4") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("c6533558-76f3-4312-8644-b2cd6615d90c") protected VariationDiagram(final AbstractDiagram elt) { this.elt = elt; } - @objid ("7b3f38f2-278b-4a7e-80fc-cc0e143a20e8") public static final class MdaTypes { - @objid ("b72607fb-9f2d-4d6a-a158-bb11fb19a5d8") public static Stereotype STEREOTYPE_ELT; - @objid ("4532d9a2-1017-4b25-9e24-25b965085d3a") private static Stereotype MDAASSOCDEP; - @objid ("6d4a84d1-0d82-4006-94ce-89fed9ccd9e2") private static TagType MDAASSOCDEP_ROLE; - @objid ("be45a9af-f9b3-4022-ac4f-e77d65d8a675") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "80f753fc-c7a9-424d-9b5a-b9475971dad9"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -150,11 +136,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/activitydiagram/ActivityDiagramVariability.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/activitydiagram/ActivityDiagramVariability.java index 997f651..a56627f 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/activitydiagram/ActivityDiagramVariability.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/activitydiagram/ActivityDiagramVariability.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -32,9 +31,7 @@ *

    Stereotype description: *

    */ -@objid ("17a4c6c4-bb78-4beb-987e-934739ad3e0e") public class ActivityDiagramVariability extends VariationDiagram { - @objid ("d393f222-def1-4403-832b-473b2a364c04") public static final String STEREOTYPE_NAME = "Activity_Diagram_(Variability)"; /** @@ -45,7 +42,6 @@ public class ActivityDiagramVariability extends VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("d842a524-300c-49b2-b71c-4104e6d1cfbe") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof ActivityDiagram) && ((ActivityDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, ActivityDiagramVariability.STEREOTYPE_NAME)); } @@ -55,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link ActivityDiagramVariability} proxy on the created {@link ActivityDiagram}. */ - @objid ("bba14d3a-2cc3-4642-ae50-e514d07297d7") public static ActivityDiagramVariability create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.ActivityDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, ActivityDiagramVariability.STEREOTYPE_NAME); @@ -63,34 +58,33 @@ public static ActivityDiagramVariability create() { } /** - * Tries to instantiate a {@link ActivityDiagramVariability} proxy from a {@link ActivityDiagram} stereotyped << Activity_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link ActivityDiagramVariability} proxy from a {@link ActivityDiagram} stereotyped << Activity_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a ActivityDiagram * @return a {@link ActivityDiagramVariability} proxy or null. */ - @objid ("079e1f01-52f5-4124-a6fd-24f07785d41c") public static ActivityDiagramVariability instantiate(final ActivityDiagram obj) { return ActivityDiagramVariability.canInstantiate(obj) ? new ActivityDiagramVariability(obj) : null; } /** - * Tries to instantiate a {@link ActivityDiagramVariability} proxy from a {@link ActivityDiagram} stereotyped << Activity_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link ActivityDiagramVariability} proxy from a {@link ActivityDiagram} stereotyped << Activity_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link ActivityDiagram} * @return a {@link ActivityDiagramVariability} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("6dc62eaa-7d0f-407a-883a-8201bb465a5c") public static ActivityDiagramVariability safeInstantiate(final ActivityDiagram obj) throws IllegalArgumentException { if (ActivityDiagramVariability.canInstantiate(obj)) - return new ActivityDiagramVariability(obj); + return new ActivityDiagramVariability(obj); else - throw new IllegalArgumentException("ActivityDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("ActivityDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("c02528d3-54a9-4066-a0fb-25db67ba975e") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -107,38 +101,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link ActivityDiagram}. + * Get the underlying {@link ActivityDiagram}. + * * @return the ActivityDiagram represented by this proxy, never null. */ - @objid ("bebdd8d2-54e7-4316-b9a9-953282c44fa5") @Override public ActivityDiagram getElement() { return (ActivityDiagram)super.getElement(); } - @objid ("593614a8-87f3-46c6-bf86-1bc89ef8b3f9") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("703d5be8-927f-4504-aa42-337737f62cd8") protected ActivityDiagramVariability(final ActivityDiagram elt) { super(elt); } - @objid ("01c0bcd5-c052-4777-9a61-62d1e56701dd") public static final class MdaTypes { - @objid ("0a53cd45-8998-4b80-85ea-4218aed3cbbd") public static Stereotype STEREOTYPE_ELT; - @objid ("e5b23673-65a9-4139-91b1-4cac222d14e7") private static Stereotype MDAASSOCDEP; - @objid ("49cc56aa-b44e-4fbb-b3a5-d8b2423fc6c3") private static TagType MDAASSOCDEP_ROLE; - @objid ("fa56c277-1be1-4158-83c1-b029b4810f8f") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "ab5fd973-2bd6-4d3e-9ec5-01774002b15d"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -146,11 +133,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/classdiagram/ClassDiagramVariability.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/classdiagram/ClassDiagramVariability.java index cbba305..a0e621b 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/classdiagram/ClassDiagramVariability.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/classdiagram/ClassDiagramVariability.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -32,9 +31,7 @@ *

    Stereotype description: *

    */ -@objid ("d642bd19-a7c8-4b26-8323-d24b83f91460") public class ClassDiagramVariability extends VariationDiagram { - @objid ("1d78123e-1f1c-4fb4-8e39-b2f3622b0702") public static final String STEREOTYPE_NAME = "Class_Diagram_(Variability)"; /** @@ -45,7 +42,6 @@ public class ClassDiagramVariability extends VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("428f75d7-df0d-42ef-aa9d-c12b7e02fd49") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof ClassDiagram) && ((ClassDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, ClassDiagramVariability.STEREOTYPE_NAME)); } @@ -55,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link ClassDiagramVariability} proxy on the created {@link ClassDiagram}. */ - @objid ("99f2b19f-da79-4eac-8e54-290a060ef7a3") public static ClassDiagramVariability create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.ClassDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, ClassDiagramVariability.STEREOTYPE_NAME); @@ -63,34 +58,33 @@ public static ClassDiagramVariability create() { } /** - * Tries to instantiate a {@link ClassDiagramVariability} proxy from a {@link ClassDiagram} stereotyped << Class_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link ClassDiagramVariability} proxy from a {@link ClassDiagram} stereotyped << Class_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a ClassDiagram * @return a {@link ClassDiagramVariability} proxy or null. */ - @objid ("2a817e31-57aa-4dc1-a452-596361f381fc") public static ClassDiagramVariability instantiate(final ClassDiagram obj) { return ClassDiagramVariability.canInstantiate(obj) ? new ClassDiagramVariability(obj) : null; } /** - * Tries to instantiate a {@link ClassDiagramVariability} proxy from a {@link ClassDiagram} stereotyped << Class_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link ClassDiagramVariability} proxy from a {@link ClassDiagram} stereotyped << Class_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link ClassDiagram} * @return a {@link ClassDiagramVariability} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("cb9448df-2d5a-4d97-b44b-c7a5b26a8f3e") public static ClassDiagramVariability safeInstantiate(final ClassDiagram obj) throws IllegalArgumentException { if (ClassDiagramVariability.canInstantiate(obj)) - return new ClassDiagramVariability(obj); + return new ClassDiagramVariability(obj); else - throw new IllegalArgumentException("ClassDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("ClassDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("a10eb228-7f6c-4103-b5c9-cfec34a7dcbb") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -107,38 +101,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link ClassDiagram}. + * Get the underlying {@link ClassDiagram}. + * * @return the ClassDiagram represented by this proxy, never null. */ - @objid ("9e424341-d69d-4ec8-99ef-5d4f3fcd411c") @Override public ClassDiagram getElement() { return (ClassDiagram)super.getElement(); } - @objid ("042aa833-6865-4a5f-9936-233b94ac8b94") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("4471d4ac-e751-4f9d-b700-352fb5894fd1") protected ClassDiagramVariability(final ClassDiagram elt) { super(elt); } - @objid ("b3da098d-0c69-4511-82b9-d87efde6bc0d") public static final class MdaTypes { - @objid ("ef67820c-8b10-4a83-8df8-cf3a2e08af32") public static Stereotype STEREOTYPE_ELT; - @objid ("62c4c910-c31d-4c37-a9e7-68a22f41da89") private static Stereotype MDAASSOCDEP; - @objid ("c57e79f1-0e6c-4e2d-8d95-e579038fffa4") private static TagType MDAASSOCDEP_ROLE; - @objid ("479da537-0a31-42cf-ac32-36b48df92968") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "7863d1bf-ac2d-4f1c-9a18-54bdd695004a"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -146,11 +133,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/classdiagram/FeatureDiagram.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/classdiagram/FeatureDiagram.java index 5a5dec8..cf0abcc 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/classdiagram/FeatureDiagram.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/classdiagram/FeatureDiagram.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,15 +30,12 @@ *

    Stereotype description: *
    null

    */ -@objid ("f9547a29-a090-4b9e-939e-b6e92b8a2e78") public class FeatureDiagram { - @objid ("4bd04d67-de1b-44d9-b870-46b753abcc13") public static final String STEREOTYPE_NAME = "Feature_Diagram"; /** * The underlying {@link ClassDiagram} represented by this proxy, never null. */ - @objid ("212e91ca-8c62-44d1-bcb0-d6344a3a5503") protected final ClassDiagram elt; /** @@ -50,7 +46,6 @@ public class FeatureDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("cc88cfd0-5586-4c4a-8d33-9ffea132ab89") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof ClassDiagram) && ((ClassDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, FeatureDiagram.STEREOTYPE_NAME)); } @@ -60,7 +55,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link FeatureDiagram} proxy on the created {@link ClassDiagram}. */ - @objid ("5f827745-becf-4d55-8e1e-7d8313593598") public static FeatureDiagram create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.ClassDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, FeatureDiagram.STEREOTYPE_NAME); @@ -68,34 +62,33 @@ public static FeatureDiagram create() { } /** - * Tries to instantiate a {@link FeatureDiagram} proxy from a {@link ClassDiagram} stereotyped << Feature_Diagram >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link FeatureDiagram} proxy from a {@link ClassDiagram} stereotyped << Feature_Diagram >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a ClassDiagram * @return a {@link FeatureDiagram} proxy or null. */ - @objid ("723ef1d0-88fb-4bc2-9dee-572f02bfc075") public static FeatureDiagram instantiate(final ClassDiagram obj) { return FeatureDiagram.canInstantiate(obj) ? new FeatureDiagram(obj) : null; } /** - * Tries to instantiate a {@link FeatureDiagram} proxy from a {@link ClassDiagram} stereotyped << Feature_Diagram >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link FeatureDiagram} proxy from a {@link ClassDiagram} stereotyped << Feature_Diagram >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link ClassDiagram} * @return a {@link FeatureDiagram} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("d35ecab7-865a-4ca3-bdd5-3f81bc06cf7b") public static FeatureDiagram safeInstantiate(final ClassDiagram obj) throws IllegalArgumentException { if (FeatureDiagram.canInstantiate(obj)) - return new FeatureDiagram(obj); + return new FeatureDiagram(obj); else - throw new IllegalArgumentException("FeatureDiagram: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("FeatureDiagram: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("1e9cc9ae-d2a3-4050-adda-0c4dd47ef0e3") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -112,37 +105,30 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link ClassDiagram}. + * Get the underlying {@link ClassDiagram}. + * * @return the ClassDiagram represented by this proxy, never null. */ - @objid ("9eaa7f8f-00a6-4c7f-b789-39c61f0ea0b9") public ClassDiagram getElement() { return this.elt; } - @objid ("b200308f-4679-4c49-8324-ee9cb8488d59") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("7db3fa45-f1ac-4d71-ad97-c88e1315bd9a") protected FeatureDiagram(final ClassDiagram elt) { this.elt = elt; } - @objid ("f9c5f827-ca3d-4df3-add1-4ce84f025502") public static final class MdaTypes { - @objid ("00c2b6e1-d0ed-4ddb-ab96-2173aa3a2de1") public static Stereotype STEREOTYPE_ELT; - @objid ("316ba795-d557-48f8-8a7f-cbbbaff13e70") private static Stereotype MDAASSOCDEP; - @objid ("30482a2c-a7f0-48f8-9a21-95fd33bc55d9") private static TagType MDAASSOCDEP_ROLE; - @objid ("1664297e-5c17-47b1-add1-7cbd2eeece49") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "154248f2-acd9-4c6e-9b98-8df045ffae53"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -150,11 +136,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/communicationdiagram/CommunicationDiagramVariability.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/communicationdiagram/CommunicationDiagramVariability.java index 78523d6..7500629 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/communicationdiagram/CommunicationDiagramVariability.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/communicationdiagram/CommunicationDiagramVariability.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -32,9 +31,7 @@ *

    Stereotype description: *

    */ -@objid ("8ab30b0c-1705-4f87-a02a-ebd7f7c31c72") public class CommunicationDiagramVariability extends VariationDiagram { - @objid ("e89774e3-285f-4e72-a138-f6592a625fd8") public static final String STEREOTYPE_NAME = "Communication_Diagram_(Variability)"; /** @@ -45,7 +42,6 @@ public class CommunicationDiagramVariability extends VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("f563ebd0-631f-4b51-8304-aef269bf8d1e") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof CommunicationDiagram) && ((CommunicationDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, CommunicationDiagramVariability.STEREOTYPE_NAME)); } @@ -55,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link CommunicationDiagramVariability} proxy on the created {@link CommunicationDiagram}. */ - @objid ("6920b9f3-34af-4822-88d9-e0b9cdb2ae36") public static CommunicationDiagramVariability create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.CommunicationDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, CommunicationDiagramVariability.STEREOTYPE_NAME); @@ -63,34 +58,33 @@ public static CommunicationDiagramVariability create() { } /** - * Tries to instantiate a {@link CommunicationDiagramVariability} proxy from a {@link CommunicationDiagram} stereotyped << Communication_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link CommunicationDiagramVariability} proxy from a {@link CommunicationDiagram} stereotyped << Communication_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a CommunicationDiagram * @return a {@link CommunicationDiagramVariability} proxy or null. */ - @objid ("030702da-767b-4693-aca2-e228de3fbbab") public static CommunicationDiagramVariability instantiate(final CommunicationDiagram obj) { return CommunicationDiagramVariability.canInstantiate(obj) ? new CommunicationDiagramVariability(obj) : null; } /** - * Tries to instantiate a {@link CommunicationDiagramVariability} proxy from a {@link CommunicationDiagram} stereotyped << Communication_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link CommunicationDiagramVariability} proxy from a {@link CommunicationDiagram} stereotyped << Communication_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link CommunicationDiagram} * @return a {@link CommunicationDiagramVariability} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("a65f66e8-edbb-41f7-84ed-776a089cb16e") public static CommunicationDiagramVariability safeInstantiate(final CommunicationDiagram obj) throws IllegalArgumentException { if (CommunicationDiagramVariability.canInstantiate(obj)) - return new CommunicationDiagramVariability(obj); + return new CommunicationDiagramVariability(obj); else - throw new IllegalArgumentException("CommunicationDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("CommunicationDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("79d13f29-5796-4618-ac88-03ed83fac0ef") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -107,38 +101,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link CommunicationDiagram}. + * Get the underlying {@link CommunicationDiagram}. + * * @return the CommunicationDiagram represented by this proxy, never null. */ - @objid ("4a672b9c-c2e2-4a92-b804-fdabff7ce1c9") @Override public CommunicationDiagram getElement() { return (CommunicationDiagram)super.getElement(); } - @objid ("050f7cdc-1ab9-429f-9000-2c78b72d9d68") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("ae827349-91a2-4014-bef7-16f7f0f3f00b") protected CommunicationDiagramVariability(final CommunicationDiagram elt) { super(elt); } - @objid ("d374295d-3cb8-42a3-882f-4ef3b11445a2") public static final class MdaTypes { - @objid ("4e56fb17-8fd3-408b-9b27-c806071b5ffc") public static Stereotype STEREOTYPE_ELT; - @objid ("fd8c384f-2508-4b16-9d33-4e4cfccdad23") private static Stereotype MDAASSOCDEP; - @objid ("aa9c5d53-9306-4bbe-8d57-649a84e18756") private static TagType MDAASSOCDEP_ROLE; - @objid ("dfe71845-8154-4b76-888e-842755b33300") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "75f73c97-2807-4f78-8fee-4dcb27015ba0"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -146,11 +133,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/deploymentdiagram/DeploymentDiagramVariability.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/deploymentdiagram/DeploymentDiagramVariability.java index a73aace..af8a15b 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/deploymentdiagram/DeploymentDiagramVariability.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/deploymentdiagram/DeploymentDiagramVariability.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -32,9 +31,7 @@ *

    Stereotype description: *

    */ -@objid ("6f041b1b-0201-4ce4-ac22-9cb5d89e4518") public class DeploymentDiagramVariability extends VariationDiagram { - @objid ("a47f1002-7567-4bfb-b6cd-bdb434744a10") public static final String STEREOTYPE_NAME = "Deployment_Diagram_(Variability)"; /** @@ -45,7 +42,6 @@ public class DeploymentDiagramVariability extends VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("8378685d-213e-4d5d-b3e2-599a6d4254ed") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof DeploymentDiagram) && ((DeploymentDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, DeploymentDiagramVariability.STEREOTYPE_NAME)); } @@ -55,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link DeploymentDiagramVariability} proxy on the created {@link DeploymentDiagram}. */ - @objid ("b5810dbc-9d71-4c7f-bed1-9284baea18c1") public static DeploymentDiagramVariability create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.DeploymentDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, DeploymentDiagramVariability.STEREOTYPE_NAME); @@ -63,34 +58,33 @@ public static DeploymentDiagramVariability create() { } /** - * Tries to instantiate a {@link DeploymentDiagramVariability} proxy from a {@link DeploymentDiagram} stereotyped << Deployment_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link DeploymentDiagramVariability} proxy from a {@link DeploymentDiagram} stereotyped << Deployment_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a DeploymentDiagram * @return a {@link DeploymentDiagramVariability} proxy or null. */ - @objid ("8bda618c-268c-4c2f-8473-5471e6fbd336") public static DeploymentDiagramVariability instantiate(final DeploymentDiagram obj) { return DeploymentDiagramVariability.canInstantiate(obj) ? new DeploymentDiagramVariability(obj) : null; } /** - * Tries to instantiate a {@link DeploymentDiagramVariability} proxy from a {@link DeploymentDiagram} stereotyped << Deployment_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link DeploymentDiagramVariability} proxy from a {@link DeploymentDiagram} stereotyped << Deployment_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link DeploymentDiagram} * @return a {@link DeploymentDiagramVariability} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("cf2c8137-2e9e-496a-b931-2b35e99959b9") public static DeploymentDiagramVariability safeInstantiate(final DeploymentDiagram obj) throws IllegalArgumentException { if (DeploymentDiagramVariability.canInstantiate(obj)) - return new DeploymentDiagramVariability(obj); + return new DeploymentDiagramVariability(obj); else - throw new IllegalArgumentException("DeploymentDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("DeploymentDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("8e2f556f-c7f7-45da-b1c7-f71f17ea2504") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -107,38 +101,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link DeploymentDiagram}. + * Get the underlying {@link DeploymentDiagram}. + * * @return the DeploymentDiagram represented by this proxy, never null. */ - @objid ("f777f90a-5dba-4218-9e73-f45fd9892e60") @Override public DeploymentDiagram getElement() { return (DeploymentDiagram)super.getElement(); } - @objid ("129e2fc0-8695-40aa-981b-fbfd11b35d78") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("d01bb2e4-b17f-4151-820a-3ec37e430884") protected DeploymentDiagramVariability(final DeploymentDiagram elt) { super(elt); } - @objid ("7c5c5445-8f55-4738-a33b-603fc97f8e70") public static final class MdaTypes { - @objid ("c942b0bc-0f07-4a8f-818d-f23719c1bf43") public static Stereotype STEREOTYPE_ELT; - @objid ("08e735ef-0f91-43e7-8be3-a003170de919") private static Stereotype MDAASSOCDEP; - @objid ("9a2b23cc-d162-411f-8d18-c0187014577d") private static TagType MDAASSOCDEP_ROLE; - @objid ("f2e442bc-ce4e-4727-90d8-524142b58e02") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "f534f6ce-af80-4e35-9404-5fb8bdd23352"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -146,11 +133,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/objectdiagram/ObjectDiagramVariability.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/objectdiagram/ObjectDiagramVariability.java index 1fbf4fc..157f2a8 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/objectdiagram/ObjectDiagramVariability.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/objectdiagram/ObjectDiagramVariability.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -32,9 +31,7 @@ *

    Stereotype description: *

    */ -@objid ("5e69d8ce-a14c-43b3-a011-c314dc1cd003") public class ObjectDiagramVariability extends VariationDiagram { - @objid ("b2ac15f4-eeaf-4aed-91f7-d25a473b650c") public static final String STEREOTYPE_NAME = "Object_Diagram_(Variability)"; /** @@ -45,7 +42,6 @@ public class ObjectDiagramVariability extends VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("718dab22-081e-4c60-b2d9-cc68cf87eced") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof ObjectDiagram) && ((ObjectDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, ObjectDiagramVariability.STEREOTYPE_NAME)); } @@ -55,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link ObjectDiagramVariability} proxy on the created {@link ObjectDiagram}. */ - @objid ("2602a669-31e1-4528-be1d-39c459c8a554") public static ObjectDiagramVariability create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.ObjectDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, ObjectDiagramVariability.STEREOTYPE_NAME); @@ -63,34 +58,33 @@ public static ObjectDiagramVariability create() { } /** - * Tries to instantiate a {@link ObjectDiagramVariability} proxy from a {@link ObjectDiagram} stereotyped << Object_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link ObjectDiagramVariability} proxy from a {@link ObjectDiagram} stereotyped << Object_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a ObjectDiagram * @return a {@link ObjectDiagramVariability} proxy or null. */ - @objid ("e5130299-ff91-43fc-a735-14da98815ee6") public static ObjectDiagramVariability instantiate(final ObjectDiagram obj) { return ObjectDiagramVariability.canInstantiate(obj) ? new ObjectDiagramVariability(obj) : null; } /** - * Tries to instantiate a {@link ObjectDiagramVariability} proxy from a {@link ObjectDiagram} stereotyped << Object_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link ObjectDiagramVariability} proxy from a {@link ObjectDiagram} stereotyped << Object_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link ObjectDiagram} * @return a {@link ObjectDiagramVariability} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("bce830c2-e13c-4b10-b854-2d0cd7ccd69f") public static ObjectDiagramVariability safeInstantiate(final ObjectDiagram obj) throws IllegalArgumentException { if (ObjectDiagramVariability.canInstantiate(obj)) - return new ObjectDiagramVariability(obj); + return new ObjectDiagramVariability(obj); else - throw new IllegalArgumentException("ObjectDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("ObjectDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("0e89f5b1-ee0b-42a2-8d28-57479da68239") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -107,38 +101,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link ObjectDiagram}. + * Get the underlying {@link ObjectDiagram}. + * * @return the ObjectDiagram represented by this proxy, never null. */ - @objid ("b28639dd-f28d-466b-8577-aa41016ad593") @Override public ObjectDiagram getElement() { return (ObjectDiagram)super.getElement(); } - @objid ("1b4faddb-6ade-4899-8f1c-8476753f3ff2") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("ac7c0a1e-cd76-4595-b007-0675157b874a") protected ObjectDiagramVariability(final ObjectDiagram elt) { super(elt); } - @objid ("0f6fe57d-5f1f-4aa6-999f-630215d6cf13") public static final class MdaTypes { - @objid ("e0c0ee9a-bb3f-4279-9dcb-40aeb6f845fc") public static Stereotype STEREOTYPE_ELT; - @objid ("31ea57bf-6d1f-4ebb-9944-7d70aac44abd") private static Stereotype MDAASSOCDEP; - @objid ("30a91750-4ecc-414e-adb7-e76cff573087") private static TagType MDAASSOCDEP_ROLE; - @objid ("debec485-0876-4fc4-9fc3-bf2f82f76e6f") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "faabe302-91ef-47cd-92a8-6919e788840d"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -146,11 +133,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/sequencediagram/SequenceDiagramVariability.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/sequencediagram/SequenceDiagramVariability.java index bb715d9..a5d0e6b 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/sequencediagram/SequenceDiagramVariability.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/sequencediagram/SequenceDiagramVariability.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -32,9 +31,7 @@ *

    Stereotype description: *

    */ -@objid ("67c30a19-5d9d-4659-98dc-1a97023009b2") public class SequenceDiagramVariability extends VariationDiagram { - @objid ("047550c7-5239-481f-8a8b-9c727c868ab7") public static final String STEREOTYPE_NAME = "Sequence_Diagram_(Variability)"; /** @@ -45,7 +42,6 @@ public class SequenceDiagramVariability extends VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("bdc36726-1015-489c-bc0e-1995c7f9f055") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof SequenceDiagram) && ((SequenceDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, SequenceDiagramVariability.STEREOTYPE_NAME)); } @@ -55,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link SequenceDiagramVariability} proxy on the created {@link SequenceDiagram}. */ - @objid ("605ee59d-d6aa-4552-839e-61239855e1d3") public static SequenceDiagramVariability create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.SequenceDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, SequenceDiagramVariability.STEREOTYPE_NAME); @@ -63,34 +58,33 @@ public static SequenceDiagramVariability create() { } /** - * Tries to instantiate a {@link SequenceDiagramVariability} proxy from a {@link SequenceDiagram} stereotyped << Sequence_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link SequenceDiagramVariability} proxy from a {@link SequenceDiagram} stereotyped << Sequence_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a SequenceDiagram * @return a {@link SequenceDiagramVariability} proxy or null. */ - @objid ("9bd0072f-e5e6-4d20-b447-48bc495eb9d3") public static SequenceDiagramVariability instantiate(final SequenceDiagram obj) { return SequenceDiagramVariability.canInstantiate(obj) ? new SequenceDiagramVariability(obj) : null; } /** - * Tries to instantiate a {@link SequenceDiagramVariability} proxy from a {@link SequenceDiagram} stereotyped << Sequence_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link SequenceDiagramVariability} proxy from a {@link SequenceDiagram} stereotyped << Sequence_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link SequenceDiagram} * @return a {@link SequenceDiagramVariability} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("00c0ae06-2577-42c2-8614-8ff936859a86") public static SequenceDiagramVariability safeInstantiate(final SequenceDiagram obj) throws IllegalArgumentException { if (SequenceDiagramVariability.canInstantiate(obj)) - return new SequenceDiagramVariability(obj); + return new SequenceDiagramVariability(obj); else - throw new IllegalArgumentException("SequenceDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("SequenceDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("041fc7ba-39df-4330-9954-1ae3db9f874d") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -107,38 +101,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link SequenceDiagram}. + * Get the underlying {@link SequenceDiagram}. + * * @return the SequenceDiagram represented by this proxy, never null. */ - @objid ("00719f3b-6518-4eac-9a84-b261cddd9018") @Override public SequenceDiagram getElement() { return (SequenceDiagram)super.getElement(); } - @objid ("5d3671e1-22f9-4637-a8ab-c9817d91a528") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("3234581e-d1a6-4f2c-9e64-78214c10908a") protected SequenceDiagramVariability(final SequenceDiagram elt) { super(elt); } - @objid ("c959d3ce-53de-4b69-839b-77ea65f2a591") public static final class MdaTypes { - @objid ("325c4ba0-2aff-4d0c-8fb8-b7f4c1869082") public static Stereotype STEREOTYPE_ELT; - @objid ("87c15122-e12a-4ed1-8b0f-4534debdbae6") private static Stereotype MDAASSOCDEP; - @objid ("52c665c0-495d-4778-ab8c-2ea2c294c313") private static TagType MDAASSOCDEP_ROLE; - @objid ("42d5b07e-d233-41fe-a201-e54089d2d9a6") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "cd2fe02a-d8c7-40d9-898b-46177e9cf19f"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -146,11 +133,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/statemachinediagram/StateMachineDiagramVariability.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/statemachinediagram/StateMachineDiagramVariability.java index 45cbecd..97437f1 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/statemachinediagram/StateMachineDiagramVariability.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/statemachinediagram/StateMachineDiagramVariability.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -32,9 +31,7 @@ *

    Stereotype description: *

    */ -@objid ("74b1f369-f31d-4f02-b7fe-0374126a21b9") public class StateMachineDiagramVariability extends VariationDiagram { - @objid ("fc11cfd2-cdd8-400f-9038-0d8c98e76a27") public static final String STEREOTYPE_NAME = "State_Machine_Diagram_(Variability)"; /** @@ -45,7 +42,6 @@ public class StateMachineDiagramVariability extends VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("033ddc4a-a1e0-4b1b-b605-7419537e1730") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof StateMachineDiagram) && ((StateMachineDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, StateMachineDiagramVariability.STEREOTYPE_NAME)); } @@ -55,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link StateMachineDiagramVariability} proxy on the created {@link StateMachineDiagram}. */ - @objid ("2134a0dd-ada2-490d-a112-efedf3deb81e") public static StateMachineDiagramVariability create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.StateMachineDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, StateMachineDiagramVariability.STEREOTYPE_NAME); @@ -63,34 +58,33 @@ public static StateMachineDiagramVariability create() { } /** - * Tries to instantiate a {@link StateMachineDiagramVariability} proxy from a {@link StateMachineDiagram} stereotyped << State_Machine_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link StateMachineDiagramVariability} proxy from a {@link StateMachineDiagram} stereotyped << State_Machine_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a StateMachineDiagram * @return a {@link StateMachineDiagramVariability} proxy or null. */ - @objid ("8371e0ca-f73b-4925-8119-08f2ccf8f367") public static StateMachineDiagramVariability instantiate(final StateMachineDiagram obj) { return StateMachineDiagramVariability.canInstantiate(obj) ? new StateMachineDiagramVariability(obj) : null; } /** - * Tries to instantiate a {@link StateMachineDiagramVariability} proxy from a {@link StateMachineDiagram} stereotyped << State_Machine_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link StateMachineDiagramVariability} proxy from a {@link StateMachineDiagram} stereotyped << State_Machine_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link StateMachineDiagram} * @return a {@link StateMachineDiagramVariability} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("ecee6b8b-2692-4a1a-addc-25c83ef31021") public static StateMachineDiagramVariability safeInstantiate(final StateMachineDiagram obj) throws IllegalArgumentException { if (StateMachineDiagramVariability.canInstantiate(obj)) - return new StateMachineDiagramVariability(obj); + return new StateMachineDiagramVariability(obj); else - throw new IllegalArgumentException("StateMachineDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("StateMachineDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("27f8ebb1-10c0-494c-ba66-9f69b8748326") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -107,38 +101,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link StateMachineDiagram}. + * Get the underlying {@link StateMachineDiagram}. + * * @return the StateMachineDiagram represented by this proxy, never null. */ - @objid ("30131204-c49f-4b1d-b453-8f2c66f6d5f4") @Override public StateMachineDiagram getElement() { return (StateMachineDiagram)super.getElement(); } - @objid ("5f2d4d8d-8fdd-4c98-9e82-2f15e07f198e") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("334a46fa-4579-4336-a39f-d966b204f5a5") protected StateMachineDiagramVariability(final StateMachineDiagram elt) { super(elt); } - @objid ("60015466-db0e-412c-8b01-fe2dc9358ec7") public static final class MdaTypes { - @objid ("58b3fad6-ee7a-4117-a9ac-55a50810c48a") public static Stereotype STEREOTYPE_ELT; - @objid ("bc187205-f7e3-4a74-989a-afa31c7d52fe") private static Stereotype MDAASSOCDEP; - @objid ("e119a76f-419c-4ef9-a443-155a02b1ef83") private static TagType MDAASSOCDEP_ROLE; - @objid ("21b9e14b-8ce2-452d-874f-3a8df90a1aee") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "1ebf31a3-cebd-4c1d-bfaf-f0cabe9eb4e2"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -146,11 +133,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/usecasediagram/UseCaseDiagramVariability.java b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/usecasediagram/UseCaseDiagramVariability.java index 0e370e1..86a3fe5 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/usecasediagram/UseCaseDiagramVariability.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/automatic/standard/usecasediagram/UseCaseDiagramVariability.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -32,9 +31,7 @@ *

    Stereotype description: *

    */ -@objid ("141e5757-2ac6-4946-a536-4fa6f6c483f3") public class UseCaseDiagramVariability extends VariationDiagram { - @objid ("707ed4ab-55d5-44d8-a2ef-129e337bf4e9") public static final String STEREOTYPE_NAME = "Use_Case_Diagram_(Variability)"; /** @@ -45,7 +42,6 @@ public class UseCaseDiagramVariability extends VariationDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("56f4e41a-4c35-40e5-b9df-8337db4d41b8") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof UseCaseDiagram) && ((UseCaseDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, UseCaseDiagramVariability.STEREOTYPE_NAME)); } @@ -55,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link UseCaseDiagramVariability} proxy on the created {@link UseCaseDiagram}. */ - @objid ("ad2c7454-94d5-464b-badd-34519158d1d7") public static UseCaseDiagramVariability create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.UseCaseDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, UseCaseDiagramVariability.STEREOTYPE_NAME); @@ -63,34 +58,33 @@ public static UseCaseDiagramVariability create() { } /** - * Tries to instantiate a {@link UseCaseDiagramVariability} proxy from a {@link UseCaseDiagram} stereotyped << Use_Case_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link UseCaseDiagramVariability} proxy from a {@link UseCaseDiagram} stereotyped << Use_Case_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a UseCaseDiagram * @return a {@link UseCaseDiagramVariability} proxy or null. */ - @objid ("14388e99-fe90-42b1-a599-b46e8320ffa5") public static UseCaseDiagramVariability instantiate(final UseCaseDiagram obj) { return UseCaseDiagramVariability.canInstantiate(obj) ? new UseCaseDiagramVariability(obj) : null; } /** - * Tries to instantiate a {@link UseCaseDiagramVariability} proxy from a {@link UseCaseDiagram} stereotyped << Use_Case_Diagram_(Variability) >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link UseCaseDiagramVariability} proxy from a {@link UseCaseDiagram} stereotyped << Use_Case_Diagram_(Variability) >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link UseCaseDiagram} * @return a {@link UseCaseDiagramVariability} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("7707ebb8-faac-4e33-901a-f5441e67d0d6") public static UseCaseDiagramVariability safeInstantiate(final UseCaseDiagram obj) throws IllegalArgumentException { if (UseCaseDiagramVariability.canInstantiate(obj)) - return new UseCaseDiagramVariability(obj); + return new UseCaseDiagramVariability(obj); else - throw new IllegalArgumentException("UseCaseDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("UseCaseDiagramVariability: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("814bd30a-29f3-44ea-9de5-1c1446a1e73e") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -107,38 +101,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link UseCaseDiagram}. + * Get the underlying {@link UseCaseDiagram}. + * * @return the UseCaseDiagram represented by this proxy, never null. */ - @objid ("b3834940-ff14-4fdb-ade7-815a96becb2a") @Override public UseCaseDiagram getElement() { return (UseCaseDiagram)super.getElement(); } - @objid ("e84a2b37-27d5-4046-b7e3-89cd73088e67") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("1447f77a-09c7-441e-b8a9-8a58657f34f3") protected UseCaseDiagramVariability(final UseCaseDiagram elt) { super(elt); } - @objid ("ecd98297-8490-4343-8c46-7cdb411be5ab") public static final class MdaTypes { - @objid ("c097d840-971f-4d1d-80bb-7f6b4c3eda22") public static Stereotype STEREOTYPE_ELT; - @objid ("b104d41b-1aa8-421b-9370-f474af81673d") private static Stereotype MDAASSOCDEP; - @objid ("f3c9ced4-f107-40f6-9257-2ed60af7cc7b") private static TagType MDAASSOCDEP_ROLE; - @objid ("340bca0d-351c-4bb4-a885-cc53a84655fc") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "e03a90f1-d88d-4ee7-a169-3d4c07e7c238"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -146,11 +133,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/infrastructure/matrixdefinition/VariantDefinition.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/infrastructure/matrixdefinition/VariantDefinition.java index e27ee2f..e81100b 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/infrastructure/matrixdefinition/VariantDefinition.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/infrastructure/matrixdefinition/VariantDefinition.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,15 +30,12 @@ *

    Stereotype description: *
    null

    */ -@objid ("98fad188-38d3-4989-aa9b-006746db544d") public class VariantDefinition { - @objid ("d744f5f0-1c9c-4c18-8eac-b6ba1248981a") public static final String STEREOTYPE_NAME = "VariantDefinition"; /** * The underlying {@link MatrixDefinition} represented by this proxy, never null. */ - @objid ("af3d9b1f-6866-41a8-81e8-204946c3385e") protected final MatrixDefinition elt; /** @@ -50,7 +46,6 @@ public class VariantDefinition { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("6b0ef99e-cf59-462c-ac06-fe77f3dacbd3") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof MatrixDefinition) && ((MatrixDefinition) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, VariantDefinition.STEREOTYPE_NAME)); } @@ -60,7 +55,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link VariantDefinition} proxy on the created {@link MatrixDefinition}. */ - @objid ("c7978840-b7f5-450a-bed5-12e815a37b30") public static VariantDefinition create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Infrastructure.MatrixDefinition"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, VariantDefinition.STEREOTYPE_NAME); @@ -68,34 +62,33 @@ public static VariantDefinition create() { } /** - * Tries to instantiate a {@link VariantDefinition} proxy from a {@link MatrixDefinition} stereotyped << VariantDefinition >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link VariantDefinition} proxy from a {@link MatrixDefinition} stereotyped << VariantDefinition >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a MatrixDefinition * @return a {@link VariantDefinition} proxy or null. */ - @objid ("c447c4e2-d24a-4721-b29a-118894dffa0c") public static VariantDefinition instantiate(final MatrixDefinition obj) { return VariantDefinition.canInstantiate(obj) ? new VariantDefinition(obj) : null; } /** - * Tries to instantiate a {@link VariantDefinition} proxy from a {@link MatrixDefinition} stereotyped << VariantDefinition >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link VariantDefinition} proxy from a {@link MatrixDefinition} stereotyped << VariantDefinition >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link MatrixDefinition} * @return a {@link VariantDefinition} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("a6c71079-c7b7-4081-98db-b1e021b87910") public static VariantDefinition safeInstantiate(final MatrixDefinition obj) throws IllegalArgumentException { if (VariantDefinition.canInstantiate(obj)) - return new VariantDefinition(obj); + return new VariantDefinition(obj); else - throw new IllegalArgumentException("VariantDefinition: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("VariantDefinition: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("abefde91-7197-4f42-90f8-38ae0cf9c576") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -112,37 +105,30 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link MatrixDefinition}. + * Get the underlying {@link MatrixDefinition}. + * * @return the MatrixDefinition represented by this proxy, never null. */ - @objid ("c428c695-6c1d-4710-b56b-793dde32236c") public MatrixDefinition getElement() { return this.elt; } - @objid ("0224935a-73e0-44dd-9f2a-8f1ef88d938d") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("ed0295c1-ca4e-4153-b919-ad1ce7fdc5b1") protected VariantDefinition(final MatrixDefinition elt) { this.elt = elt; } - @objid ("a0ed7f92-65c2-4b7c-ad70-011a1952ae6a") public static final class MdaTypes { - @objid ("ee5a1f75-ce67-4130-8425-4dd512fb779a") public static Stereotype STEREOTYPE_ELT; - @objid ("946697ec-4b6c-464f-834c-8354d598648e") private static Stereotype MDAASSOCDEP; - @objid ("b287e07b-1bc8-47e8-abde-db33a985ca73") private static TagType MDAASSOCDEP_ROLE; - @objid ("98bfb663-ba1f-4f3a-bab5-765ff36d836b") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "b7482db0-6136-496c-b767-fa2e748eb902"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -150,11 +136,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/AlternativeFeature.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/AlternativeFeature.java index 31f5bfc..3f83a3d 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/AlternativeFeature.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/AlternativeFeature.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,9 +30,7 @@ *

    Stereotype description: *
    null

    */ -@objid ("1ca3059a-c96d-47f9-b809-1a70b42cedf8") public class AlternativeFeature extends Feature { - @objid ("efd93360-f94d-4560-bf14-7d2c105eac80") public static final String STEREOTYPE_NAME = "AlternativeFeature"; /** @@ -44,7 +41,6 @@ public class AlternativeFeature extends Feature { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("61ce85ee-8602-4b72-8fe2-1ed9d6dd05dd") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Class) && ((Class) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, AlternativeFeature.STEREOTYPE_NAME)); } @@ -54,7 +50,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link AlternativeFeature} proxy on the created {@link Class}. */ - @objid ("b16e6b4a-a6e7-4bd8-8951-d954fbad1149") public static AlternativeFeature create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Class"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, AlternativeFeature.STEREOTYPE_NAME); @@ -62,34 +57,33 @@ public static AlternativeFeature create() { } /** - * Tries to instantiate a {@link AlternativeFeature} proxy from a {@link Class} stereotyped << AlternativeFeature >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link AlternativeFeature} proxy from a {@link Class} stereotyped << AlternativeFeature >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Class * @return a {@link AlternativeFeature} proxy or null. */ - @objid ("80ac7c75-71ff-4aec-96aa-a9c1771b60ae") public static AlternativeFeature instantiate(final Class obj) { return AlternativeFeature.canInstantiate(obj) ? new AlternativeFeature(obj) : null; } /** - * Tries to instantiate a {@link AlternativeFeature} proxy from a {@link Class} stereotyped << AlternativeFeature >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link AlternativeFeature} proxy from a {@link Class} stereotyped << AlternativeFeature >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Class} * @return a {@link AlternativeFeature} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("1340df5f-0b89-40e5-954f-535a2c6e8331") public static AlternativeFeature safeInstantiate(final Class obj) throws IllegalArgumentException { if (AlternativeFeature.canInstantiate(obj)) - return new AlternativeFeature(obj); + return new AlternativeFeature(obj); else - throw new IllegalArgumentException("AlternativeFeature: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("AlternativeFeature: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("608c1ba4-e4e1-4336-8d15-084c15ff6ae8") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -106,38 +100,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Class}. + * Get the underlying {@link Class}. + * * @return the Class represented by this proxy, never null. */ - @objid ("2b854629-615b-4d3b-a83e-dcf46c248470") @Override public Class getElement() { return (Class)super.getElement(); } - @objid ("72b8de2e-5f10-45dd-97c9-bcab29f914a9") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("fdb86775-62d9-48a7-bfa1-23005e9d9c1e") protected AlternativeFeature(final Class elt) { super(elt); } - @objid ("f4136720-d5fc-413a-8193-49d86a436526") public static final class MdaTypes { - @objid ("8d87a4ac-b235-4ae9-8a85-1343294cf371") public static Stereotype STEREOTYPE_ELT; - @objid ("5888d8c5-871f-43a8-8ba0-edf83078b986") private static Stereotype MDAASSOCDEP; - @objid ("5e3fb44e-8873-4931-8c76-2d0d18979f8f") private static TagType MDAASSOCDEP_ROLE; - @objid ("86ecfb3c-9f1c-47de-affb-434ec1ad654e") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "7a57929a-4732-49b8-aeab-83709e8be6c6"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -145,11 +132,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/Feature.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/Feature.java index 76c70f9..a97ab0f 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/Feature.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/Feature.java @@ -10,7 +10,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.module.context.IModuleContext; import org.modelio.metamodel.uml.infrastructure.Dependency; @@ -28,36 +27,31 @@ *

    Stereotype description: *
    null

    */ -@objid ("d7faef9f-820f-4ebe-98e8-bc811a70843e") public class Feature { - @objid ("27ce4bb8-e133-4519-8786-6d9f9161f42c") public static final String STEREOTYPE_NAME = "Feature"; /** * The underlying {@link Class} represented by this proxy, never null. */ - @objid ("a65f6a3f-68e9-462d-8697-57eea9144f62") protected final Class elt; /** * Tells whether a {@link Feature proxy} can be instantiated from a {@link MObject} checking it is a {@link Class} stereotyped << Feature >>. *

    * The method returns false if the instantiation cannot be carried out. - * + * * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("6592e4cc-40f9-4fb6-84f2-37dfb15458b7") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Class) && ((Class) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, Feature.STEREOTYPE_NAME)); } /** * Create a new {@link Class} stereotyped << Feature >> then instantiate a {@link Feature} proxy. - * + * * @return a {@link Feature} proxy on the created {@link Class}. */ - @objid ("617c6f0d-519a-4435-adaa-43d3180dd737") public static Feature create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Class"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, Feature.STEREOTYPE_NAME); @@ -68,10 +62,10 @@ public static Feature create() { * Tries to instantiate a {@link Feature} proxy from a {@link Class} stereotyped << Feature >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Class * @return a {@link Feature} proxy or null. */ - @objid ("049ef336-57ea-40e9-9383-e600f15f1fe5") public static Feature instantiate(final Class obj) { return Feature.canInstantiate(obj) ? new Feature(obj) : null; } @@ -80,25 +74,23 @@ public static Feature instantiate(final Class obj) { * Tries to instantiate a {@link Feature} proxy from a {@link Class} stereotyped << Feature >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Class} * @return a {@link Feature} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("78c75c83-97dc-4a24-8400-c135d561668a") public static Feature safeInstantiate(final Class obj) throws IllegalArgumentException { if (Feature.canInstantiate(obj)) - return new Feature(obj); + return new Feature(obj); else - throw new IllegalArgumentException("Feature: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("Feature: Cannot instantiate "+obj+": wrong element type or stereotype"); } /** * Add a value to the 'featuredElt' role.

    * Role description: * null - * */ - @objid ("e500aaf2-d9b0-4718-af83-99e48662911f") public void addFeaturedElt(final ModelElement obj) { if (obj != null) { IModelingSession session = VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession(); @@ -112,9 +104,7 @@ public void addFeaturedElt(final ModelElement obj) { * Add a value of the 'variant' role.

    * Role description: * null - * */ - @objid ("71686ee1-765f-4e79-bb0a-ef953933c021") public void addVariant(final Variant obj) { if (obj != null) { IModelingSession session = VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession(); @@ -124,7 +114,6 @@ public void addVariant(final Variant obj) { } } - @objid ("f576cb8f-35d8-4ebb-8c31-d3205c079d62") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -142,9 +131,9 @@ public boolean equals(final Object obj) { /** * Get the underlying {@link Class}. + * * @return the Class represented by this proxy, never null. */ - @objid ("1615cdc7-ee5b-4bfd-add8-ae1bb546d2f3") public Class getElement() { return this.elt; } @@ -153,9 +142,7 @@ public Class getElement() { * Get the values of the 'featuredElt' role.

    * Role description: * null - * */ - @objid ("95c03670-e1ce-4a89-a73a-34a2b1e401cc") public List getFeaturedElt() { List results = new ArrayList<>(); for (Dependency d : this.elt.getDependsOnDependency()) { @@ -170,9 +157,7 @@ public List getFeaturedElt() { * Get the values of the 'variant' role.

    * Role description: * null - * */ - @objid ("254dafb9-a267-4514-b7ab-f17acb8e3197") public List getVariant() { List results = new ArrayList<>(); for (Dependency d : this.elt.getImpactedDependency()) { @@ -185,7 +170,6 @@ public List getVariant() { return Collections.unmodifiableList(results); } - @objid ("56a74025-45d5-4dc2-a5e7-152851a50223") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -195,9 +179,7 @@ public int hashCode() { * Remove a value from the 'featuredElt' role.

    * Role description: * null - * */ - @objid ("19f04f13-3e5b-4742-832e-b162bced47ae") public boolean removeFeaturedElt(final ModelElement obj) { if (obj != null) { for (Dependency d : new ArrayList<>(this.elt.getDependsOnDependency())) { @@ -215,9 +197,7 @@ public boolean removeFeaturedElt(final ModelElement obj) { * Remove a value from 'variant' role.

    * Role description: * null - * */ - @objid ("cd22bc6d-842b-4528-a193-2fb7cbb895d4") public boolean removeVariant(final Variant obj) { if (obj != null) { for (Dependency d : new ArrayList<>(this.elt.getImpactedDependency())) { @@ -231,23 +211,17 @@ public boolean removeVariant(final Variant obj) { return false; } - @objid ("fe6bacc5-6660-4a4b-9198-980565b744de") protected Feature(final Class elt) { this.elt = elt; } - @objid ("d833b925-4b8d-4a82-87cc-01b359041a62") public static final class MdaTypes { - @objid ("309192ba-26ef-43bb-afc7-8b2397d476b1") public static Stereotype STEREOTYPE_ELT; - @objid ("ebac8466-4f91-4053-b8d6-c7df56f104bf") private static Stereotype MDAASSOCDEP; - @objid ("b29734a4-4ff8-4a11-b123-e7aa9e58b5b5") private static TagType MDAASSOCDEP_ROLE; - @objid ("96b3ea38-252e-4903-88f4-7400eda29f72") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "7477447f-27bb-4997-b4d4-49785dee4238"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -255,11 +229,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/FeatureRoot.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/FeatureRoot.java index 2d53322..d0035c6 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/FeatureRoot.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/FeatureRoot.java @@ -10,7 +10,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -24,7 +23,6 @@ import org.modelio.metamodel.uml.statik.Class; import org.modelio.module.variabilitydesigner.api.IVariabilityDesignerPeerModule; import org.modelio.module.variabilitydesigner.api.VariabilityDesignerProxyFactory; -import org.modelio.module.variabilitydesigner.api.feature.standard.class_.Variant; import org.modelio.module.variabilitydesigner.impl.VariabilityDesignerModule; import org.modelio.vcore.smkernel.mapi.MObject; @@ -33,9 +31,7 @@ *

    Stereotype description: *
    null

    */ -@objid ("563bce98-be27-43c1-8fd1-58af9d80b4c8") public class FeatureRoot extends Feature { - @objid ("0522db50-0e59-4841-8a23-ea239bde2e13") public static final String STEREOTYPE_NAME = "FeatureRoot"; /** @@ -46,7 +42,6 @@ public class FeatureRoot extends Feature { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("7c930e5a-63a0-49e9-89e9-93d58172f1aa") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Class) && ((Class) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, FeatureRoot.STEREOTYPE_NAME)); } @@ -56,7 +51,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link FeatureRoot} proxy on the created {@link Class}. */ - @objid ("8c4935a0-0cd0-4ca3-af0a-a24b7deb0e8b") public static FeatureRoot create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Class"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, FeatureRoot.STEREOTYPE_NAME); @@ -64,40 +58,38 @@ public static FeatureRoot create() { } /** - * Tries to instantiate a {@link FeatureRoot} proxy from a {@link Class} stereotyped << FeatureRoot >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link FeatureRoot} proxy from a {@link Class} stereotyped << FeatureRoot >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Class * @return a {@link FeatureRoot} proxy or null. */ - @objid ("4aceaa05-1032-4713-adff-37151b83d9fa") public static FeatureRoot instantiate(final Class obj) { return FeatureRoot.canInstantiate(obj) ? new FeatureRoot(obj) : null; } /** - * Tries to instantiate a {@link FeatureRoot} proxy from a {@link Class} stereotyped << FeatureRoot >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link FeatureRoot} proxy from a {@link Class} stereotyped << FeatureRoot >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Class} * @return a {@link FeatureRoot} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("c4eec3e6-5e2d-406b-9374-874ecbc9182c") public static FeatureRoot safeInstantiate(final Class obj) throws IllegalArgumentException { if (FeatureRoot.canInstantiate(obj)) - return new FeatureRoot(obj); + return new FeatureRoot(obj); else - throw new IllegalArgumentException("FeatureRoot: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("FeatureRoot: Cannot instantiate "+obj+": wrong element type or stereotype"); } /** * Add a value of the 'variant' role.

    * Role description: * null - * */ - @objid ("d25f3182-ace7-45f2-a977-338a58fa6ce6") public void addVariant(final Variant obj) { if (obj != null) { IModelingSession session = VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession(); @@ -107,7 +99,6 @@ public void addVariant(final Variant obj) { } } - @objid ("b44f70f3-4039-48cc-8b52-6591d2b8e6d5") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -124,10 +115,10 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Class}. + * Get the underlying {@link Class}. + * * @return the Class represented by this proxy, never null. */ - @objid ("57a7c398-13a9-4c67-9d26-58656fb24066") @Override public Class getElement() { return (Class)super.getElement(); @@ -137,9 +128,7 @@ public Class getElement() { * Get the values of the 'variant' role.

    * Role description: * null - * */ - @objid ("e049ce99-cd83-4334-8583-f3332b7705c2") public List getVariant() { List results = new ArrayList<>(); for (Dependency d : this.elt.getImpactedDependency()) { @@ -152,7 +141,6 @@ public List getVariant() { return Collections.unmodifiableList(results); } - @objid ("0228c46a-e85b-4418-b5e8-555e8be5832f") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -162,9 +150,7 @@ public int hashCode() { * Remove a value from 'variant' role.

    * Role description: * null - * */ - @objid ("a8c7d75f-4316-4571-8fd6-aaffeaffd360") public boolean removeVariant(final Variant obj) { if (obj != null) { for (Dependency d : new ArrayList<>(this.elt.getImpactedDependency())) { @@ -178,23 +164,17 @@ public boolean removeVariant(final Variant obj) { return false; } - @objid ("f62d417e-aa9a-4d8e-815e-73221c37ad48") protected FeatureRoot(final Class elt) { super(elt); } - @objid ("d87852be-b3be-4179-9d26-6c5a5e4dc8a1") public static final class MdaTypes { - @objid ("c315a9a2-2370-4cae-939a-4b55fd26cbf0") public static Stereotype STEREOTYPE_ELT; - @objid ("59527a55-f7b2-4a28-bcf4-a5a411381d5c") private static Stereotype MDAASSOCDEP; - @objid ("8e0f190d-76cc-4119-b73f-7bfb40c47797") private static TagType MDAASSOCDEP_ROLE; - @objid ("ae9890d3-573a-4d4e-bb35-7787d278483d") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "f64bc54e-2d80-4bae-98ed-792224160a56"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -202,11 +182,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/MandatoryFeature.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/MandatoryFeature.java index 3766608..567a64c 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/MandatoryFeature.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/MandatoryFeature.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,9 +30,7 @@ *

    Stereotype description: *
    null

    */ -@objid ("f9a88220-fe1f-4720-964a-ace39b4d0da8") public class MandatoryFeature extends Feature { - @objid ("8b209d71-cd33-4280-8d7a-80f9e2c65b91") public static final String STEREOTYPE_NAME = "MandatoryFeature"; /** @@ -44,7 +41,6 @@ public class MandatoryFeature extends Feature { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("b8bcbd7e-8231-44b4-8f4c-1acd8d29eac9") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Class) && ((Class) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, MandatoryFeature.STEREOTYPE_NAME)); } @@ -54,7 +50,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link MandatoryFeature} proxy on the created {@link Class}. */ - @objid ("a86dd5f6-a08b-4e23-97a2-a9024580da6a") public static MandatoryFeature create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Class"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, MandatoryFeature.STEREOTYPE_NAME); @@ -62,34 +57,33 @@ public static MandatoryFeature create() { } /** - * Tries to instantiate a {@link MandatoryFeature} proxy from a {@link Class} stereotyped << MandatoryFeature >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link MandatoryFeature} proxy from a {@link Class} stereotyped << MandatoryFeature >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Class * @return a {@link MandatoryFeature} proxy or null. */ - @objid ("b9e76a6a-31f4-4051-82bc-ca5d6977175f") public static MandatoryFeature instantiate(final Class obj) { return MandatoryFeature.canInstantiate(obj) ? new MandatoryFeature(obj) : null; } /** - * Tries to instantiate a {@link MandatoryFeature} proxy from a {@link Class} stereotyped << MandatoryFeature >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link MandatoryFeature} proxy from a {@link Class} stereotyped << MandatoryFeature >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Class} * @return a {@link MandatoryFeature} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("9426cab4-e9a0-498f-b964-16d220a4ea5f") public static MandatoryFeature safeInstantiate(final Class obj) throws IllegalArgumentException { if (MandatoryFeature.canInstantiate(obj)) - return new MandatoryFeature(obj); + return new MandatoryFeature(obj); else - throw new IllegalArgumentException("MandatoryFeature: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("MandatoryFeature: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("ffce1041-d5db-41cb-bda2-f78c06e066e1") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -106,38 +100,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Class}. + * Get the underlying {@link Class}. + * * @return the Class represented by this proxy, never null. */ - @objid ("e54e58e8-eb2e-4b26-9ec6-71c7d9b43059") @Override public Class getElement() { return (Class)super.getElement(); } - @objid ("1bb671cb-449e-40e8-93c7-7b46d7977345") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("ee8fe65e-eb93-44b1-946e-2d30a9b770dc") protected MandatoryFeature(final Class elt) { super(elt); } - @objid ("4699ea48-1417-4aac-abcd-6b0cb248048b") public static final class MdaTypes { - @objid ("a6ac8bf4-dec8-4f3a-81ac-f855dafbb7fc") public static Stereotype STEREOTYPE_ELT; - @objid ("a3b4c562-beaa-4aa7-afdb-7e5d08ad0234") private static Stereotype MDAASSOCDEP; - @objid ("a4b1cea9-0e50-4b3c-a327-d0c468bb6383") private static TagType MDAASSOCDEP_ROLE; - @objid ("1ce427cb-45ca-43d2-a90e-b0600fe17791") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "523c9b53-38f5-4f81-887d-57d47ee96b91"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -145,11 +132,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/OptionalFeature.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/OptionalFeature.java index a3960b6..851248b 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/OptionalFeature.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/OptionalFeature.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,9 +30,7 @@ *

    Stereotype description: *
    null

    */ -@objid ("b78a7b97-1700-4445-99fb-273c076e7394") public class OptionalFeature extends Feature { - @objid ("ddf4c779-e453-4544-abb4-390783aedff8") public static final String STEREOTYPE_NAME = "OptionalFeature"; /** @@ -44,7 +41,6 @@ public class OptionalFeature extends Feature { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("915ff068-a911-4a9b-bdfb-4fc5ff5bf8fa") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Class) && ((Class) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, OptionalFeature.STEREOTYPE_NAME)); } @@ -54,7 +50,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link OptionalFeature} proxy on the created {@link Class}. */ - @objid ("d4d06285-1e70-4082-a9bf-af277fe3a997") public static OptionalFeature create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Class"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, OptionalFeature.STEREOTYPE_NAME); @@ -62,34 +57,33 @@ public static OptionalFeature create() { } /** - * Tries to instantiate a {@link OptionalFeature} proxy from a {@link Class} stereotyped << OptionalFeature >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link OptionalFeature} proxy from a {@link Class} stereotyped << OptionalFeature >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Class * @return a {@link OptionalFeature} proxy or null. */ - @objid ("9047de1a-eb4c-49d7-a55d-107be0470521") public static OptionalFeature instantiate(final Class obj) { return OptionalFeature.canInstantiate(obj) ? new OptionalFeature(obj) : null; } /** - * Tries to instantiate a {@link OptionalFeature} proxy from a {@link Class} stereotyped << OptionalFeature >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link OptionalFeature} proxy from a {@link Class} stereotyped << OptionalFeature >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Class} * @return a {@link OptionalFeature} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("2ad3d53f-7d7f-45f4-b69b-4eac01f59ec4") public static OptionalFeature safeInstantiate(final Class obj) throws IllegalArgumentException { if (OptionalFeature.canInstantiate(obj)) - return new OptionalFeature(obj); + return new OptionalFeature(obj); else - throw new IllegalArgumentException("OptionalFeature: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("OptionalFeature: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("fb7103d3-555d-431f-8802-9ab51bd7e9b1") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -106,38 +100,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Class}. + * Get the underlying {@link Class}. + * * @return the Class represented by this proxy, never null. */ - @objid ("67f073d3-d48c-4daa-8f3c-e0ffc65c13c6") @Override public Class getElement() { return (Class)super.getElement(); } - @objid ("ecc313f8-d0fd-49e1-afec-d185340481b6") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("b369f32f-f007-480e-82dd-332ac07b44a9") protected OptionalFeature(final Class elt) { super(elt); } - @objid ("f7f3ee67-f9aa-471f-97e2-3e5a0ce9ac8a") public static final class MdaTypes { - @objid ("5dfdba44-977e-479a-9ef6-a7ac1b351bcf") public static Stereotype STEREOTYPE_ELT; - @objid ("63d7b6ca-8658-407e-81bb-ba4ceb095b7f") private static Stereotype MDAASSOCDEP; - @objid ("5c0bb785-7c9f-49d3-beff-c057b2905352") private static TagType MDAASSOCDEP_ROLE; - @objid ("b4320722-31f8-4e4b-971d-32a06a1823d7") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "7f47f70f-9623-422b-b953-1791a7dc994c"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -145,11 +132,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/OrFeature.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/OrFeature.java index b88cbac..b0de55a 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/OrFeature.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/OrFeature.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,9 +30,7 @@ *

    Stereotype description: *
    null

    */ -@objid ("a47886f2-a78e-41d0-b16b-ff3d34a99909") public class OrFeature extends Feature { - @objid ("c1806798-5c6d-4fac-8c1c-12eed823e37c") public static final String STEREOTYPE_NAME = "OrFeature"; /** @@ -44,7 +41,6 @@ public class OrFeature extends Feature { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("4743f84e-ad16-4b39-a421-a5d6c84a1917") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Class) && ((Class) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, OrFeature.STEREOTYPE_NAME)); } @@ -54,7 +50,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link OrFeature} proxy on the created {@link Class}. */ - @objid ("104c280e-e89f-494f-a184-fd46cff23b5d") public static OrFeature create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Class"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, OrFeature.STEREOTYPE_NAME); @@ -62,34 +57,33 @@ public static OrFeature create() { } /** - * Tries to instantiate a {@link OrFeature} proxy from a {@link Class} stereotyped << OrFeature >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link OrFeature} proxy from a {@link Class} stereotyped << OrFeature >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Class * @return a {@link OrFeature} proxy or null. */ - @objid ("9b91263e-4466-4dba-b645-e1800773ab74") public static OrFeature instantiate(final Class obj) { return OrFeature.canInstantiate(obj) ? new OrFeature(obj) : null; } /** - * Tries to instantiate a {@link OrFeature} proxy from a {@link Class} stereotyped << OrFeature >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link OrFeature} proxy from a {@link Class} stereotyped << OrFeature >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Class} * @return a {@link OrFeature} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("8d74851a-f55e-4bb4-94fb-564382b27ee9") public static OrFeature safeInstantiate(final Class obj) throws IllegalArgumentException { if (OrFeature.canInstantiate(obj)) - return new OrFeature(obj); + return new OrFeature(obj); else - throw new IllegalArgumentException("OrFeature: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("OrFeature: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("dba63b1e-aad5-4b7e-ab15-9b3b04f7ac3c") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -106,38 +100,31 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Class}. + * Get the underlying {@link Class}. + * * @return the Class represented by this proxy, never null. */ - @objid ("29f089be-ca42-4171-975f-0da8f11aa6c7") @Override public Class getElement() { return (Class)super.getElement(); } - @objid ("e88c858e-76f4-4ca0-98a0-a12522f29a34") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("b54edfcf-f0d1-420b-ab3b-57e69d0457f8") protected OrFeature(final Class elt) { super(elt); } - @objid ("985a11db-d643-40e0-9ba1-9dafd0c23801") public static final class MdaTypes { - @objid ("6996ae2c-0983-4971-85cb-18967f6a236a") public static Stereotype STEREOTYPE_ELT; - @objid ("c3daf46c-3ea5-4aa9-812b-256419b0e733") private static Stereotype MDAASSOCDEP; - @objid ("90bc2048-30ca-4526-9c26-4f697c8fb253") private static TagType MDAASSOCDEP_ROLE; - @objid ("ad095541-dac4-4cdf-bd6d-ad68a3a76b71") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "a33dfdac-cf62-4751-b671-820cee4606f6"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -145,11 +132,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/Variant.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/Variant.java index 84b4e38..e09c8fa 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/Variant.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/class_/Variant.java @@ -10,7 +10,6 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -24,8 +23,6 @@ import org.modelio.metamodel.uml.statik.Class; import org.modelio.module.variabilitydesigner.api.IVariabilityDesignerPeerModule; import org.modelio.module.variabilitydesigner.api.VariabilityDesignerProxyFactory; -import org.modelio.module.variabilitydesigner.api.feature.standard.class_.Feature; -import org.modelio.module.variabilitydesigner.api.feature.standard.class_.FeatureRoot; import org.modelio.module.variabilitydesigner.impl.VariabilityDesignerModule; import org.modelio.vcore.smkernel.mapi.MObject; @@ -34,15 +31,12 @@ *

    Stereotype description: *
    null

    */ -@objid ("939b5316-2866-4100-bc9b-8c9e61d4b80c") public class Variant { - @objid ("40c17591-caf4-4f3b-8d27-930968f335f4") public static final String STEREOTYPE_NAME = "Variant"; /** * The underlying {@link Class} represented by this proxy, never null. */ - @objid ("01bb24f5-eae6-4e74-b3f2-53500435ed45") protected final Class elt; /** @@ -53,7 +47,6 @@ public class Variant { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("c9329b27-8eb7-48d1-8054-452ef9edccd7") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Class) && ((Class) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, Variant.STEREOTYPE_NAME)); } @@ -63,7 +56,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link Variant} proxy on the created {@link Class}. */ - @objid ("1862d85e-cc03-460d-8f59-52391597b106") public static Variant create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Class"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, Variant.STEREOTYPE_NAME); @@ -71,40 +63,38 @@ public static Variant create() { } /** - * Tries to instantiate a {@link Variant} proxy from a {@link Class} stereotyped << Variant >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link Variant} proxy from a {@link Class} stereotyped << Variant >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Class * @return a {@link Variant} proxy or null. */ - @objid ("b0ac5115-69df-4916-a799-7923265943c4") public static Variant instantiate(final Class obj) { return Variant.canInstantiate(obj) ? new Variant(obj) : null; } /** - * Tries to instantiate a {@link Variant} proxy from a {@link Class} stereotyped << Variant >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link Variant} proxy from a {@link Class} stereotyped << Variant >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Class} * @return a {@link Variant} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("cb876e5c-e655-4975-9043-129dd7b9c2c5") public static Variant safeInstantiate(final Class obj) throws IllegalArgumentException { if (Variant.canInstantiate(obj)) - return new Variant(obj); + return new Variant(obj); else - throw new IllegalArgumentException("Variant: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("Variant: Cannot instantiate "+obj+": wrong element type or stereotype"); } /** * Add a value to the 'feature' role.

    * Role description: * null - * */ - @objid ("b4a66323-627c-4f16-9ce7-dc4a99dcc3a2") public void addFeature(final Feature obj) { if (obj != null) { IModelingSession session = VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession(); @@ -114,7 +104,6 @@ public void addFeature(final Feature obj) { } } - @objid ("7f87a6cf-f8d7-4ff7-aa13-fd56fa1918ca") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -131,10 +120,10 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Class}. + * Get the underlying {@link Class}. + * * @return the Class represented by this proxy, never null. */ - @objid ("9a434324-875e-4a49-bb7d-294c1e32bfdb") public Class getElement() { return this.elt; } @@ -143,9 +132,7 @@ public Class getElement() { * Get the values of the 'feature' role.

    * Role description: * null - * */ - @objid ("64248b80-c957-43d8-a736-cb0048b400c8") public List getFeature() { List results = new ArrayList<>(); for (Dependency d : this.elt.getDependsOnDependency()) { @@ -161,9 +148,7 @@ public List getFeature() { * Get the value of the 'root' role.

    * Role description: * null - * */ - @objid ("a3b0b4f4-8ae5-4c10-aa27-2e302358c720") public FeatureRoot getRoot() { for (Dependency d : this.elt.getDependsOnDependency()) { if (d.isStereotyped(Variant.MdaTypes.MDAASSOCDEP) @@ -175,7 +160,6 @@ public FeatureRoot getRoot() { return null; } - @objid ("f20056fe-1b65-4c85-8bf3-945f8f2f50e8") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -185,9 +169,7 @@ public int hashCode() { * Remove a value from the 'feature' role.

    * Role description: * null - * */ - @objid ("817674f3-d409-49ce-b29c-deeeb890431f") public boolean removeFeature(final Feature obj) { if (obj != null) { for (Dependency d : new ArrayList<>(this.elt.getDependsOnDependency())) { @@ -205,9 +187,7 @@ public boolean removeFeature(final Feature obj) { * Set the value of the 'root' role.

    * Role description: * null - * */ - @objid ("6f216e49-1879-4e3b-842b-4741a75b45f5") public void setRoot(final FeatureRoot obj) { Dependency dep = null; for (Dependency d : this.elt.getDependsOnDependency()) @@ -227,23 +207,17 @@ public void setRoot(final FeatureRoot obj) { } } - @objid ("83ec2c4a-dc63-4224-87e3-9175193d577e") protected Variant(final Class elt) { this.elt = elt; } - @objid ("39e8d603-3926-4a17-8311-d44221e18817") public static final class MdaTypes { - @objid ("3a273cd0-3e88-4486-bc8d-f3bfdd2f0449") public static Stereotype STEREOTYPE_ELT; - @objid ("f58d5171-896c-41dd-bac0-cd14ae3dd0d0") private static Stereotype MDAASSOCDEP; - @objid ("76c23401-72d3-4211-ab41-1eb2fd20de75") private static TagType MDAASSOCDEP_ROLE; - @objid ("6ce9a233-9f3f-4c1c-9320-14066e658c31") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "d3208dba-742d-40c8-8e15-d84aa3f1bfc8"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -251,11 +225,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/classdiagram/VariabilityDiagram.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/classdiagram/VariabilityDiagram.java index eded00b..d410944 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/classdiagram/VariabilityDiagram.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/classdiagram/VariabilityDiagram.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,15 +30,12 @@ *

    Stereotype description: *
    null

    */ -@objid ("1f51683d-fa55-468f-a988-cce4e3c0d6ac") public class VariabilityDiagram { - @objid ("2310f658-521b-4d28-82c0-dee2ea2a3032") public static final String STEREOTYPE_NAME = "VariabilityDiagram"; /** * The underlying {@link ClassDiagram} represented by this proxy, never null. */ - @objid ("248d96d8-463f-4fe8-af29-17665658e36a") protected final ClassDiagram elt; /** @@ -50,7 +46,6 @@ public class VariabilityDiagram { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("ffc40db7-5329-40de-8500-3f9812f326e0") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof ClassDiagram) && ((ClassDiagram) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, VariabilityDiagram.STEREOTYPE_NAME)); } @@ -60,7 +55,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link VariabilityDiagram} proxy on the created {@link ClassDiagram}. */ - @objid ("f93ea8f6-942a-470e-b6ef-be267c77e113") public static VariabilityDiagram create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.ClassDiagram"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, VariabilityDiagram.STEREOTYPE_NAME); @@ -75,7 +69,6 @@ public static VariabilityDiagram create() { * @param obj a ClassDiagram * @return a {@link VariabilityDiagram} proxy or null. */ - @objid ("b9e8e1f7-9547-4d55-b428-8c503f982d97") public static VariabilityDiagram instantiate(final ClassDiagram obj) { return VariabilityDiagram.canInstantiate(obj) ? new VariabilityDiagram(obj) : null; } @@ -89,7 +82,6 @@ public static VariabilityDiagram instantiate(final ClassDiagram obj) { * @return a {@link VariabilityDiagram} proxy. * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("0dc9caa9-df3c-401e-a14a-a27fe3f1efbb") public static VariabilityDiagram safeInstantiate(final ClassDiagram obj) throws IllegalArgumentException { if (VariabilityDiagram.canInstantiate(obj)) return new VariabilityDiagram(obj); @@ -97,7 +89,6 @@ public static VariabilityDiagram safeInstantiate(final ClassDiagram obj) throws throw new IllegalArgumentException("VariabilityDiagram: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("c7d013a2-15ed-4c90-92fe-a2355f134ab5") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -118,34 +109,26 @@ public boolean equals(final Object obj) { * * @return the ClassDiagram represented by this proxy, never null. */ - @objid ("9381cf5e-6270-4094-85c7-c58361ce867a") public ClassDiagram getElement() { return this.elt; } - @objid ("f54365a3-d57b-4cba-a816-d8a93eb0e1b2") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("b6dfbfc3-57f5-4cfc-bb78-c90098015bde") protected VariabilityDiagram(final ClassDiagram elt) { this.elt = elt; } - @objid ("4d214dce-c095-447c-ac38-7dcab6ba7555") public static final class MdaTypes { - @objid ("30ece6c7-e08b-435e-a7d0-3be8a14317b6") public static Stereotype STEREOTYPE_ELT; - @objid ("fc569ec4-6ec9-411a-b1ef-6b36a4288ef3") private static Stereotype MDAASSOCDEP; - @objid ("00133a74-3c02-454e-afbf-fb3900de3e65") private static TagType MDAASSOCDEP_ROLE; - @objid ("bd5d0324-1d34-4cdc-9a21-921779177a9e") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "525c6525-7dd9-438e-8317-eb2ba304b770"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/package_/FeatureModel.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/package_/FeatureModel.java index 7ec0a71..ab6b43f 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/package_/FeatureModel.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/package_/FeatureModel.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,15 +30,12 @@ *

    Stereotype description: *
    null

    */ -@objid ("2e974c37-91e7-4a51-87c7-c5b37727fb97") public class FeatureModel { - @objid ("8021de3f-e691-42d4-9cd5-784c9223b6f9") public static final String STEREOTYPE_NAME = "FeatureModel"; /** * The underlying {@link Package} represented by this proxy, never null. */ - @objid ("f6648571-6c06-42e5-8526-420a06dc9fc0") protected final Package elt; /** @@ -50,7 +46,6 @@ public class FeatureModel { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("80ba8779-c844-4b63-b5a3-039bcc287269") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Package) && ((Package) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, FeatureModel.STEREOTYPE_NAME)); } @@ -60,7 +55,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link FeatureModel} proxy on the created {@link Package}. */ - @objid ("1c66fc09-a384-4f5a-9600-d3ef6c02cbdb") public static FeatureModel create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Package"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, FeatureModel.STEREOTYPE_NAME); @@ -68,34 +62,33 @@ public static FeatureModel create() { } /** - * Tries to instantiate a {@link FeatureModel} proxy from a {@link Package} stereotyped << FeatureModel >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link FeatureModel} proxy from a {@link Package} stereotyped << FeatureModel >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Package * @return a {@link FeatureModel} proxy or null. */ - @objid ("1cb2b317-c37c-4beb-b1ba-856cf0dcf8b9") public static FeatureModel instantiate(final Package obj) { return FeatureModel.canInstantiate(obj) ? new FeatureModel(obj) : null; } /** - * Tries to instantiate a {@link FeatureModel} proxy from a {@link Package} stereotyped << FeatureModel >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link FeatureModel} proxy from a {@link Package} stereotyped << FeatureModel >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Package} * @return a {@link FeatureModel} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("48661dee-1425-4856-998c-479a0987d090") public static FeatureModel safeInstantiate(final Package obj) throws IllegalArgumentException { if (FeatureModel.canInstantiate(obj)) - return new FeatureModel(obj); + return new FeatureModel(obj); else - throw new IllegalArgumentException("FeatureModel: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("FeatureModel: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("942ac058-769f-4474-be65-3156da6c5acc") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -112,37 +105,30 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Package}. + * Get the underlying {@link Package}. + * * @return the Package represented by this proxy, never null. */ - @objid ("77a6eac0-5b48-4276-b145-9284710f7c08") public Package getElement() { return this.elt; } - @objid ("392382c2-4858-4a56-9043-64c3f10437e6") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("5782d162-bb1b-42ed-bc4d-898bd2004633") protected FeatureModel(final Package elt) { this.elt = elt; } - @objid ("4cb7f9c1-c03b-4fa9-bdd4-a57abd3c9e46") public static final class MdaTypes { - @objid ("c33459e5-dc2d-46da-9ab5-4e2415f6b63f") public static Stereotype STEREOTYPE_ELT; - @objid ("7c92528d-6d8d-4465-9303-9b8276b842c9") private static Stereotype MDAASSOCDEP; - @objid ("a149b073-4633-421e-bb9e-883a24e3391c") private static TagType MDAASSOCDEP_ROLE; - @objid ("fc92c6fe-cf43-4f65-a09b-b7857bb3d074") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "9e29638a-e6aa-4437-9bfc-1961caa78867"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -150,11 +136,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/umlmodelelement/ModelElement.java b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/umlmodelelement/ModelElement.java index 8f2b88c..76ccbe0 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/umlmodelelement/ModelElement.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/feature/standard/umlmodelelement/ModelElement.java @@ -7,7 +7,6 @@ package org.modelio.module.variabilitydesigner.api.feature.standard.umlmodelelement; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.module.context.IModuleContext; import org.modelio.metamodel.uml.infrastructure.Dependency; @@ -25,26 +24,22 @@ *

    Description: *
    ModelElement

    */ -@objid ("af9544a7-7894-4094-b41c-95fffac80f62") public class ModelElement { - @objid ("38427820-b606-4fe9-b16e-13609b551ca0") public static final String FEATURE_NOTETYPE = "Feature"; /** * The underlying {@link UmlModelElement} represented by this proxy, never null. */ - @objid ("b19fc752-54f2-4e7a-afdc-25afa30704ab") protected final UmlModelElement elt; /** * Tells whether a {@link ModelElement proxy} can be instantiated from a {@link MObject} checking it is a {@link UmlModelElement}. *

    * The method returns false if the instantiation cannot be carried out. - * + * * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("023a2c4b-3ff6-4fac-b2ef-610e034838d1") public static boolean canInstantiate(final MObject elt) { return (elt instanceof UmlModelElement); } @@ -53,15 +48,14 @@ public static boolean canInstantiate(final MObject elt) { * Tries to instantiate a {@link ModelElement} proxy from a {@link UmlModelElement} checking its metaclass. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a UmlModelElement * @return a {@link ModelElement} proxy or null. */ - @objid ("471ca3a2-7594-49c7-8ede-9781d82dfa2f") public static ModelElement instantiate(final UmlModelElement obj) { return ModelElement.canInstantiate(obj) ? new ModelElement(obj) : null; } - @objid ("218b052d-34bb-436d-9d62-008143ef8022") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -79,9 +73,9 @@ public boolean equals(final Object obj) { /** * Get the underlying {@link UmlModelElement}. + * * @return the UmlModelElement represented by this proxy, never null. */ - @objid ("3bfee931-3f30-4cf0-90f9-0bf533ff7624") public UmlModelElement getElement() { return this.elt; } @@ -91,7 +85,6 @@ public UmlModelElement getElement() { *

    Note description: *
    null

    */ - @objid ("8aaedc49-0e98-4fa7-825a-eddbafdb3c89") public String getFeatureNote() { return this.elt.getNoteContent(ModelElement.MdaTypes.FEATURE_NOTETYPE_ELT); } @@ -100,9 +93,7 @@ public String getFeatureNote() { * Get the value of the 'relatedFeature' role.

    * Role description: * null - * */ - @objid ("429862b3-28b5-4e5d-a16b-04f690ce4d03") public Feature getRelatedFeature() { for (Dependency d : this.elt.getImpactedDependency()) { if (d.isStereotyped(ModelElement.MdaTypes.MDAASSOCDEP) @@ -114,7 +105,6 @@ public Feature getRelatedFeature() { return null; } - @objid ("f6a70086-dc7f-4fd4-881f-3f36faedcfcf") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -125,7 +115,6 @@ public int hashCode() { *

    Note description: *
    null

    */ - @objid ("af6f797f-237f-4de5-9da0-e04a3be5b543") public void setFeatureNote(final String value) { this.elt.putNoteContent(ModelElement.MdaTypes.FEATURE_NOTETYPE_ELT, value); } @@ -134,9 +123,7 @@ public void setFeatureNote(final String value) { * Set the value of the 'relatedFeature' role.

    * Role description: * null - * */ - @objid ("6443499f-0952-4b61-b2bf-c39ce020bc1e") public void setRelatedFeature(final Feature obj) { Dependency dep = null; for (Dependency d : this.elt.getImpactedDependency()) @@ -157,23 +144,17 @@ public void setRelatedFeature(final Feature obj) { } } - @objid ("740b7862-692d-4363-8168-fff3ed74c31d") protected ModelElement(final UmlModelElement elt) { this.elt = elt; } - @objid ("0a5033bc-cc0f-4724-8b97-6df4390f7785") public static final class MdaTypes { - @objid ("1bb589ea-203a-4dfc-b886-e70551493b8a") public static NoteType FEATURE_NOTETYPE_ELT; - @objid ("c8bfb69a-3e97-4394-874d-c482c814316a") private static Stereotype MDAASSOCDEP; - @objid ("8ce83a73-621b-4f94-a5ac-6363ea0e0cd3") private static TagType MDAASSOCDEP_ROLE; - @objid ("05cdd2e6-df51-4b33-bfc1-67e99176d15f") public static void init(final IModuleContext ctx) { FEATURE_NOTETYPE_ELT = ctx.getModelingSession().findElementById(NoteType.class, "a0a32e9f-4557-446b-8453-6da2529f505e"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -181,11 +162,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/projectsetup/standard/package_/Model150.java b/src/main/java/org/modelio/module/variabilitydesigner/api/projectsetup/standard/package_/Model150.java index 641117c..d933963 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/projectsetup/standard/package_/Model150.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/projectsetup/standard/package_/Model150.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,15 +30,12 @@ *

    Stereotype description: *

    */ -@objid ("7e41c2d4-3d73-4b78-94c1-d1be998aa617") public class Model150 { - @objid ("f8997203-5783-4c86-9d57-d15ea52b854d") public static final String STEREOTYPE_NAME = "model150"; /** * The underlying {@link Package} represented by this proxy, never null. */ - @objid ("99dc144f-0bfe-4f9a-9c07-8b08a3ffd868") protected final Package elt; /** @@ -50,7 +46,6 @@ public class Model150 { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("127283d4-06e7-4f4b-b880-895fb2cb1d9e") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Package) && ((Package) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, Model150.STEREOTYPE_NAME)); } @@ -60,7 +55,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link Model150} proxy on the created {@link Package}. */ - @objid ("10e885f3-3a21-4a85-a8f2-064925060d4a") public static Model150 create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Package"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, Model150.STEREOTYPE_NAME); @@ -68,34 +62,33 @@ public static Model150 create() { } /** - * Tries to instantiate a {@link Model150} proxy from a {@link Package} stereotyped << model150 >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link Model150} proxy from a {@link Package} stereotyped << model150 >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Package * @return a {@link Model150} proxy or null. */ - @objid ("24d60e20-1037-43c9-b9ef-fc11cf93cef1") public static Model150 instantiate(final Package obj) { return Model150.canInstantiate(obj) ? new Model150(obj) : null; } /** - * Tries to instantiate a {@link Model150} proxy from a {@link Package} stereotyped << model150 >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link Model150} proxy from a {@link Package} stereotyped << model150 >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Package} * @return a {@link Model150} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("becf5f10-dc69-4d75-95cf-44c0e7c6b871") public static Model150 safeInstantiate(final Package obj) throws IllegalArgumentException { if (Model150.canInstantiate(obj)) - return new Model150(obj); + return new Model150(obj); else - throw new IllegalArgumentException("Model150: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("Model150: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("de97bb99-1ece-4bd4-9cb5-914c8ccdc234") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -112,37 +105,30 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Package}. + * Get the underlying {@link Package}. + * * @return the Package represented by this proxy, never null. */ - @objid ("544fc9ce-f2ea-4682-bee4-850efa0c3691") public Package getElement() { return this.elt; } - @objid ("aeb576e3-1f07-4064-9dfb-fbbd155be55c") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); } - @objid ("7d898fa2-9207-4613-b262-c526b8bad376") protected Model150(final Package elt) { this.elt = elt; } - @objid ("1b61205d-fc72-493b-bca2-b3549f9ce5d8") public static final class MdaTypes { - @objid ("0ff1022a-ca8d-42ef-94fb-06ffb906a278") public static Stereotype STEREOTYPE_ELT; - @objid ("65b536b7-e6cc-4dc4-bb63-e6d51cc36f68") private static Stereotype MDAASSOCDEP; - @objid ("9e6ad3c8-09d2-4735-894d-8290fa22d7fc") private static TagType MDAASSOCDEP_ROLE; - @objid ("758f0f1f-9977-4980-86e0-e4b790a33c10") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "8518a7a5-144c-4189-a2c4-5bb7df84003f"); MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e"); @@ -150,11 +136,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/AlternativeParameterVariation.java b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/AlternativeParameterVariation.java index 61c3d40..eb3bef4 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/AlternativeParameterVariation.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/AlternativeParameterVariation.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,21 +30,15 @@ *

    Stereotype description: *

    */ -@objid ("dcbab187-0621-494f-a710-9a2f1770f4ed") public class AlternativeParameterVariation extends Variation { - @objid ("d564a592-51c0-451e-819d-3f63dc7b6cef") public static final String STEREOTYPE_NAME = "Alternative_Parameter_Variation"; - @objid ("2dbe0668-dd91-43b2-9ef7-a28bf0801126") public static final String APPLIED_ON_TAGTYPE = "Applied_on"; - @objid ("f4605a1e-e709-4066-beb2-d637d7d91442") public static final String CONDITION_TAGTYPE = "Condition"; - @objid ("a9150d4f-755a-4ea1-8e0d-fbbadd411afc") public static final String TYPE_TAGTYPE = "Type"; - @objid ("4c501b3b-d70b-4ca3-a82e-cbdd3251b853") public static final String VALUE_TAGTYPE = "Value"; /** @@ -56,7 +49,6 @@ public class AlternativeParameterVariation extends Variation { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("20af1822-5a12-406c-a7f0-97f602e71ddc") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Constraint) && ((Constraint) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, AlternativeParameterVariation.STEREOTYPE_NAME)); } @@ -66,7 +58,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link AlternativeParameterVariation} proxy on the created {@link Constraint}. */ - @objid ("d9e61a09-1c46-46c0-83e4-62fc91364608") public static AlternativeParameterVariation create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Constraint"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, AlternativeParameterVariation.STEREOTYPE_NAME); @@ -74,34 +65,33 @@ public static AlternativeParameterVariation create() { } /** - * Tries to instantiate a {@link AlternativeParameterVariation} proxy from a {@link Constraint} stereotyped << Alternative_Parameter_Variation >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link AlternativeParameterVariation} proxy from a {@link Constraint} stereotyped << Alternative_Parameter_Variation >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Constraint * @return a {@link AlternativeParameterVariation} proxy or null. */ - @objid ("67e8d624-49cb-4a84-820d-40e4116af94e") public static AlternativeParameterVariation instantiate(final Constraint obj) { return AlternativeParameterVariation.canInstantiate(obj) ? new AlternativeParameterVariation(obj) : null; } /** - * Tries to instantiate a {@link AlternativeParameterVariation} proxy from a {@link Constraint} stereotyped << Alternative_Parameter_Variation >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link AlternativeParameterVariation} proxy from a {@link Constraint} stereotyped << Alternative_Parameter_Variation >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Constraint} * @return a {@link AlternativeParameterVariation} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("5ba27c5a-7b96-4ef0-88aa-394ec4214d55") public static AlternativeParameterVariation safeInstantiate(final Constraint obj) throws IllegalArgumentException { if (AlternativeParameterVariation.canInstantiate(obj)) - return new AlternativeParameterVariation(obj); + return new AlternativeParameterVariation(obj); else - throw new IllegalArgumentException("AlternativeParameterVariation: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("AlternativeParameterVariation: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("7a7d330e-9826-4ffb-9e48-96895bba9b73") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -122,7 +112,6 @@ public boolean equals(final Object obj) { *

    Property description: *

    */ - @objid ("8fc7e688-0311-4234-a7c2-0f7e87f00890") public String getApplied_on() { return this.elt.getTagValue(AlternativeParameterVariation.MdaTypes.APPLIED_ON_TAGTYPE_ELT); } @@ -132,16 +121,15 @@ public String getApplied_on() { *

    Property description: *

    */ - @objid ("f206032e-f0a8-439f-8abc-112551499dbb") public String getCondition() { return this.elt.getTagValue(AlternativeParameterVariation.MdaTypes.CONDITION_TAGTYPE_ELT); } /** - * Get the underlying {@link Constraint}. + * Get the underlying {@link Constraint}. + * * @return the Constraint represented by this proxy, never null. */ - @objid ("0a721037-b5cf-4e40-80ae-8553be912b44") @Override public Constraint getElement() { return (Constraint)super.getElement(); @@ -152,7 +140,6 @@ public Constraint getElement() { *

    Property description: *

    */ - @objid ("32d52834-7e29-462a-a47b-e1c437b5b3b6") public String getType() { return this.elt.getTagValue(AlternativeParameterVariation.MdaTypes.TYPE_TAGTYPE_ELT); } @@ -162,12 +149,10 @@ public String getType() { *

    Property description: *

    */ - @objid ("afea96b5-de95-41c9-83cc-4205b05606fc") public String getValue() { return this.elt.getTagValue(AlternativeParameterVariation.MdaTypes.VALUE_TAGTYPE_ELT); } - @objid ("32462582-e3b3-4721-9bfb-5959b48c767e") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -178,7 +163,6 @@ public int hashCode() { *

    Property description: *

    */ - @objid ("386cacf4-ac73-46e7-b026-43dad95a090a") public void setApplied_on(final String value) { this.elt.putTagValue(AlternativeParameterVariation.MdaTypes.APPLIED_ON_TAGTYPE_ELT, value); } @@ -188,7 +172,6 @@ public void setApplied_on(final String value) { *

    Property description: *

    */ - @objid ("4b72cabd-106b-4e4c-a8bf-5571c23c5a89") public void setCondition(final String value) { this.elt.putTagValue(AlternativeParameterVariation.MdaTypes.CONDITION_TAGTYPE_ELT, value); } @@ -198,7 +181,6 @@ public void setCondition(final String value) { *

    Property description: *

    */ - @objid ("57a5af2d-1946-4e6c-b8c9-049e42311429") public void setType(final String value) { this.elt.putTagValue(AlternativeParameterVariation.MdaTypes.TYPE_TAGTYPE_ELT, value); } @@ -208,40 +190,29 @@ public void setType(final String value) { *

    Property description: *

    */ - @objid ("860154c3-1bab-4467-a43e-af2b1d5369e2") public void setValue(final String value) { this.elt.putTagValue(AlternativeParameterVariation.MdaTypes.VALUE_TAGTYPE_ELT, value); } - @objid ("f5de0267-0086-4cc1-aed6-fdc1f815d607") protected AlternativeParameterVariation(final Constraint elt) { super(elt); } - @objid ("2582670d-e6ac-47f1-bece-932d25a24572") public static final class MdaTypes { - @objid ("ac4b8b3b-eaae-402c-a8e1-adcef2591709") public static Stereotype STEREOTYPE_ELT; - @objid ("5cb14fdb-8ea5-413d-b155-0b2e4872fa2e") public static TagType TYPE_TAGTYPE_ELT; - @objid ("16f7e008-bc5c-4986-b1e1-7b4420f928d3") public static TagType CONDITION_TAGTYPE_ELT; - @objid ("f525d54c-a0e1-45c5-8168-39c7a1f1a3f2") public static TagType VALUE_TAGTYPE_ELT; - @objid ("26e3c4d0-7de4-4380-9051-1ee641babe91") public static TagType APPLIED_ON_TAGTYPE_ELT; - @objid ("9a8707b9-5c06-49b0-afe3-d092e212b333") private static Stereotype MDAASSOCDEP; - @objid ("797739d4-fd1d-498f-a707-01c35a44840f") private static TagType MDAASSOCDEP_ROLE; - @objid ("fb470cfd-f54a-4ccb-9d2b-eb51773f1869") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "6f9faa55-f77b-4111-a573-8295ceb345fc"); TYPE_TAGTYPE_ELT = ctx.getModelingSession().findElementById(TagType.class, "09055b18-ba6e-4c41-a512-e941fe8a81c3"); @@ -253,11 +224,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/AlternativeStructuralVariation.java b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/AlternativeStructuralVariation.java index 6a3ebdf..661faea 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/AlternativeStructuralVariation.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/AlternativeStructuralVariation.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,15 +30,11 @@ *

    Stereotype description: *

    */ -@objid ("eb6666d5-d22d-404b-97c4-34be40946f90") public class AlternativeStructuralVariation extends Variation { - @objid ("eb46f8b2-f0e3-4a7c-ad2d-5791384f0690") public static final String STEREOTYPE_NAME = "Alternative_Structural_Variation"; - @objid ("94521e35-c080-4bc6-98f3-358db21e42ca") public static final String CONDITION_TAGTYPE = "Condition"; - @objid ("2a8c7ba2-8735-4565-895a-3089f65f12bc") public static final String TYPE_TAGTYPE = "Type"; /** @@ -50,7 +45,6 @@ public class AlternativeStructuralVariation extends Variation { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("adfea0df-2882-452c-8390-29f86382eebc") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Constraint) && ((Constraint) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, AlternativeStructuralVariation.STEREOTYPE_NAME)); } @@ -60,7 +54,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link AlternativeStructuralVariation} proxy on the created {@link Constraint}. */ - @objid ("494894cb-2fed-4315-ace8-a472c0b36020") public static AlternativeStructuralVariation create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Constraint"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, AlternativeStructuralVariation.STEREOTYPE_NAME); @@ -68,34 +61,33 @@ public static AlternativeStructuralVariation create() { } /** - * Tries to instantiate a {@link AlternativeStructuralVariation} proxy from a {@link Constraint} stereotyped << Alternative_Structural_Variation >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link AlternativeStructuralVariation} proxy from a {@link Constraint} stereotyped << Alternative_Structural_Variation >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Constraint * @return a {@link AlternativeStructuralVariation} proxy or null. */ - @objid ("10315351-5f4c-495b-8baa-0814ae6c1d19") public static AlternativeStructuralVariation instantiate(final Constraint obj) { return AlternativeStructuralVariation.canInstantiate(obj) ? new AlternativeStructuralVariation(obj) : null; } /** - * Tries to instantiate a {@link AlternativeStructuralVariation} proxy from a {@link Constraint} stereotyped << Alternative_Structural_Variation >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link AlternativeStructuralVariation} proxy from a {@link Constraint} stereotyped << Alternative_Structural_Variation >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Constraint} * @return a {@link AlternativeStructuralVariation} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("27c8ce08-868d-4e63-98f1-d9ec67e821f1") public static AlternativeStructuralVariation safeInstantiate(final Constraint obj) throws IllegalArgumentException { if (AlternativeStructuralVariation.canInstantiate(obj)) - return new AlternativeStructuralVariation(obj); + return new AlternativeStructuralVariation(obj); else - throw new IllegalArgumentException("AlternativeStructuralVariation: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("AlternativeStructuralVariation: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("507fcca8-d44c-4f3e-846f-f3bd14edeeeb") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -116,16 +108,15 @@ public boolean equals(final Object obj) { *

    Property description: *

    */ - @objid ("d9053829-e0a1-4f41-ae9b-f903da02a28b") public String getCondition() { return this.elt.getTagValue(AlternativeStructuralVariation.MdaTypes.CONDITION_TAGTYPE_ELT); } /** - * Get the underlying {@link Constraint}. + * Get the underlying {@link Constraint}. + * * @return the Constraint represented by this proxy, never null. */ - @objid ("21eb3eb7-6dfe-4755-8213-500d8f7d9347") @Override public Constraint getElement() { return (Constraint)super.getElement(); @@ -136,12 +127,10 @@ public Constraint getElement() { *

    Property description: *

    */ - @objid ("2ca16dce-a283-46b4-9473-60cde82786ed") public String getType() { return this.elt.getTagValue(AlternativeStructuralVariation.MdaTypes.TYPE_TAGTYPE_ELT); } - @objid ("0d9adabc-e08d-463f-bc1e-2c14881e65ed") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -152,7 +141,6 @@ public int hashCode() { *

    Property description: *

    */ - @objid ("bd69034f-1e56-462f-81c5-c9ab51fcda76") public void setCondition(final String value) { this.elt.putTagValue(AlternativeStructuralVariation.MdaTypes.CONDITION_TAGTYPE_ELT, value); } @@ -162,34 +150,25 @@ public void setCondition(final String value) { *

    Property description: *

    */ - @objid ("a87d597c-92dd-4e07-808e-e18ec7efe29a") public void setType(final String value) { this.elt.putTagValue(AlternativeStructuralVariation.MdaTypes.TYPE_TAGTYPE_ELT, value); } - @objid ("b2bdefe2-04bc-40cd-8d91-a45912a3e99c") protected AlternativeStructuralVariation(final Constraint elt) { super(elt); } - @objid ("efd2261f-a089-46f7-985f-665fe60fe3dd") public static final class MdaTypes { - @objid ("e6c12154-ede1-4704-bf7c-e91a523b039a") public static Stereotype STEREOTYPE_ELT; - @objid ("09472da6-f0f9-4497-9bc8-a235ed92dedd") public static TagType TYPE_TAGTYPE_ELT; - @objid ("1f5c55c2-274f-4a88-bf4f-af8da9304526") public static TagType CONDITION_TAGTYPE_ELT; - @objid ("c70e7e1e-c414-460f-bb50-131003d41a75") private static Stereotype MDAASSOCDEP; - @objid ("ab65390d-0618-4219-be9c-5deae43652dc") private static TagType MDAASSOCDEP_ROLE; - @objid ("5ba8aded-434d-4725-a22d-fb20af4073d0") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "bc83b3b7-a7bb-44f1-b3b1-8a0f60e3a7a2"); TYPE_TAGTYPE_ELT = ctx.getModelingSession().findElementById(TagType.class, "7fc513ff-2c09-4b58-a0ef-8a427170891c"); @@ -199,11 +178,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/CalculatedParameterVariation.java b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/CalculatedParameterVariation.java index 6c1dfa5..4150d04 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/CalculatedParameterVariation.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/CalculatedParameterVariation.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,18 +30,13 @@ *

    Stereotype description: *

    */ -@objid ("d49f83fb-6562-45ae-b3b4-dafcabdac9dc") public class CalculatedParameterVariation extends Variation { - @objid ("97d2668a-3462-4f93-8daf-aafaf6064279") public static final String STEREOTYPE_NAME = "Calculated_Parameter_Variation"; - @objid ("6ed8098a-2ded-45eb-96f2-4f725a95a8a5") public static final String APPLIED_ON_TAGTYPE = "Applied_on"; - @objid ("09eb7d20-67df-46e9-b3e9-2490dd778dcc") public static final String EXPRESSION_TAGTYPE = "Expression"; - @objid ("968baa58-ecd1-4a4d-b749-5ca38422ef8b") public static final String TYPE_TAGTYPE = "Type"; /** @@ -53,7 +47,6 @@ public class CalculatedParameterVariation extends Variation { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("5ea55d88-72de-470e-bf64-70a08afa1c91") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Constraint) && ((Constraint) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, CalculatedParameterVariation.STEREOTYPE_NAME)); } @@ -63,7 +56,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link CalculatedParameterVariation} proxy on the created {@link Constraint}. */ - @objid ("9fe16caa-41ee-4c89-8b8d-81faf8e4544b") public static CalculatedParameterVariation create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Constraint"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, CalculatedParameterVariation.STEREOTYPE_NAME); @@ -71,34 +63,33 @@ public static CalculatedParameterVariation create() { } /** - * Tries to instantiate a {@link CalculatedParameterVariation} proxy from a {@link Constraint} stereotyped << Calculated_Parameter_Variation >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link CalculatedParameterVariation} proxy from a {@link Constraint} stereotyped << Calculated_Parameter_Variation >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Constraint * @return a {@link CalculatedParameterVariation} proxy or null. */ - @objid ("2a59f8e4-7563-4e77-bd82-3f20e06c3c77") public static CalculatedParameterVariation instantiate(final Constraint obj) { return CalculatedParameterVariation.canInstantiate(obj) ? new CalculatedParameterVariation(obj) : null; } /** - * Tries to instantiate a {@link CalculatedParameterVariation} proxy from a {@link Constraint} stereotyped << Calculated_Parameter_Variation >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link CalculatedParameterVariation} proxy from a {@link Constraint} stereotyped << Calculated_Parameter_Variation >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Constraint} * @return a {@link CalculatedParameterVariation} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("0e3ab9e5-d048-4809-8801-db584d539a07") public static CalculatedParameterVariation safeInstantiate(final Constraint obj) throws IllegalArgumentException { if (CalculatedParameterVariation.canInstantiate(obj)) - return new CalculatedParameterVariation(obj); + return new CalculatedParameterVariation(obj); else - throw new IllegalArgumentException("CalculatedParameterVariation: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("CalculatedParameterVariation: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("64660703-8dba-4d5e-b17f-f358b9568552") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -119,16 +110,15 @@ public boolean equals(final Object obj) { *

    Property description: *

    */ - @objid ("dde0c6fa-e119-426a-b448-882ba837a073") public String getApplied_on() { return this.elt.getTagValue(CalculatedParameterVariation.MdaTypes.APPLIED_ON_TAGTYPE_ELT); } /** - * Get the underlying {@link Constraint}. + * Get the underlying {@link Constraint}. + * * @return the Constraint represented by this proxy, never null. */ - @objid ("ec9e4a92-0ec5-4f17-acef-cec551cd64af") @Override public Constraint getElement() { return (Constraint)super.getElement(); @@ -139,7 +129,6 @@ public Constraint getElement() { *

    Property description: *

    */ - @objid ("13112dd8-d06f-4c17-b65c-44b4822edefe") public String getExpression() { return this.elt.getTagValue(CalculatedParameterVariation.MdaTypes.EXPRESSION_TAGTYPE_ELT); } @@ -149,12 +138,10 @@ public String getExpression() { *

    Property description: *

    */ - @objid ("2dbf1c70-724c-43dc-b901-0f424b0f7b85") public String getType() { return this.elt.getTagValue(CalculatedParameterVariation.MdaTypes.TYPE_TAGTYPE_ELT); } - @objid ("31502a68-3d06-4352-8d3d-bf551fd632d4") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -165,7 +152,6 @@ public int hashCode() { *

    Property description: *

    */ - @objid ("09846f90-f30d-46ac-8966-997ad4b00515") public void setApplied_on(final String value) { this.elt.putTagValue(CalculatedParameterVariation.MdaTypes.APPLIED_ON_TAGTYPE_ELT, value); } @@ -175,7 +161,6 @@ public void setApplied_on(final String value) { *

    Property description: *

    */ - @objid ("5ae83efe-5857-4cbd-89e1-af4fd04dc8a2") public void setExpression(final String value) { this.elt.putTagValue(CalculatedParameterVariation.MdaTypes.EXPRESSION_TAGTYPE_ELT, value); } @@ -185,37 +170,27 @@ public void setExpression(final String value) { *

    Property description: *

    */ - @objid ("4b3074b6-b58a-47ae-8066-08d893d12498") public void setType(final String value) { this.elt.putTagValue(CalculatedParameterVariation.MdaTypes.TYPE_TAGTYPE_ELT, value); } - @objid ("acbaf8f3-42cc-490d-b8f9-8399eb1148d7") protected CalculatedParameterVariation(final Constraint elt) { super(elt); } - @objid ("c4e9b9bf-56d7-4885-a514-4a58b23e7ea8") public static final class MdaTypes { - @objid ("f5fc587b-912c-47e3-a922-e42c3bbd07d8") public static Stereotype STEREOTYPE_ELT; - @objid ("6c684e97-ead3-45e5-b22e-0afde3280d21") public static TagType TYPE_TAGTYPE_ELT; - @objid ("eadb6259-5a3f-4b8c-baef-1f8b94963468") public static TagType EXPRESSION_TAGTYPE_ELT; - @objid ("ab718d34-a11b-4240-9e22-50b89e4b612e") public static TagType APPLIED_ON_TAGTYPE_ELT; - @objid ("8c4a21ff-4627-4af4-b6f6-ea4850e1f517") private static Stereotype MDAASSOCDEP; - @objid ("0e8a94b4-6927-46c6-b4e2-c5eb7507e231") private static TagType MDAASSOCDEP_ROLE; - @objid ("127f941c-36b3-413d-8fd1-37fa92ccab12") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "b67fcb92-1c2d-4a52-9a18-a5ded16b9a4f"); TYPE_TAGTYPE_ELT = ctx.getModelingSession().findElementById(TagType.class, "85b8a68d-faba-47e7-a57c-8d8420954bf7"); @@ -226,11 +201,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/OptionalStructuralVariation.java b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/OptionalStructuralVariation.java index 15d4151..8904bcc 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/OptionalStructuralVariation.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/OptionalStructuralVariation.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,15 +30,11 @@ *

    Stereotype description: *

    */ -@objid ("4b0aaea0-6643-4553-a985-b88ba0ee68d7") public class OptionalStructuralVariation extends Variation { - @objid ("d975a14d-6fe5-47a3-aabf-8809081e0324") public static final String STEREOTYPE_NAME = "Optional_Structural_Variation"; - @objid ("c85136bb-94dd-4b4b-bff8-643caec61e4d") public static final String CONDITION_TAGTYPE = "Condition"; - @objid ("99bd6921-71ab-4207-be41-a596b6a8c72c") public static final String TYPE_TAGTYPE = "Type"; /** @@ -50,7 +45,6 @@ public class OptionalStructuralVariation extends Variation { * @param elt a model object * @return true if the instantiation can be carried out else false. */ - @objid ("abe5ef11-1ff9-43c7-a185-699a1032f122") public static boolean canInstantiate(final MObject elt) { return ((elt instanceof Constraint) && ((Constraint) elt).isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, OptionalStructuralVariation.STEREOTYPE_NAME)); } @@ -60,7 +54,6 @@ public static boolean canInstantiate(final MObject elt) { * * @return a {@link OptionalStructuralVariation} proxy on the created {@link Constraint}. */ - @objid ("4ad2c2d7-5897-40d0-bfff-2352c0cd5445") public static OptionalStructuralVariation create() { ModelElement e = (ModelElement)VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Standard.Constraint"); e.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, OptionalStructuralVariation.STEREOTYPE_NAME); @@ -68,34 +61,33 @@ public static OptionalStructuralVariation create() { } /** - * Tries to instantiate a {@link OptionalStructuralVariation} proxy from a {@link Constraint} stereotyped << Optional_Structural_Variation >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link OptionalStructuralVariation} proxy from a {@link Constraint} stereotyped << Optional_Structural_Variation >> checking its metaclass and its stereotype. *

    * The method returns null if the instantiation cannot be carried out. + * * @param obj a Constraint * @return a {@link OptionalStructuralVariation} proxy or null. */ - @objid ("b5484d3c-f8cd-4971-af38-f63a5e496a26") public static OptionalStructuralVariation instantiate(final Constraint obj) { return OptionalStructuralVariation.canInstantiate(obj) ? new OptionalStructuralVariation(obj) : null; } /** - * Tries to instantiate a {@link OptionalStructuralVariation} proxy from a {@link Constraint} stereotyped << Optional_Structural_Variation >> checking its metaclass and its stereotype. + * Tries to instantiate a {@link OptionalStructuralVariation} proxy from a {@link Constraint} stereotyped << Optional_Structural_Variation >> checking its metaclass and its stereotype. *

    * The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out. + * * @param obj a {@link Constraint} * @return a {@link OptionalStructuralVariation} proxy. - * @throws IllegalArgumentException if the instantiation cannot be carried out. + * @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out. */ - @objid ("21c19343-fff5-45bd-9289-23d22969748b") public static OptionalStructuralVariation safeInstantiate(final Constraint obj) throws IllegalArgumentException { if (OptionalStructuralVariation.canInstantiate(obj)) - return new OptionalStructuralVariation(obj); + return new OptionalStructuralVariation(obj); else - throw new IllegalArgumentException("OptionalStructuralVariation: Cannot instantiate "+obj+": wrong element type or stereotype"); + throw new IllegalArgumentException("OptionalStructuralVariation: Cannot instantiate "+obj+": wrong element type or stereotype"); } - @objid ("b398217b-82c0-4cb3-bb1c-e291563f7613") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -116,16 +108,15 @@ public boolean equals(final Object obj) { *

    Property description: *

    */ - @objid ("05825160-0ac0-40e9-9f2f-14b3095423ac") public String getCondition() { return this.elt.getTagValue(OptionalStructuralVariation.MdaTypes.CONDITION_TAGTYPE_ELT); } /** - * Get the underlying {@link Constraint}. + * Get the underlying {@link Constraint}. + * * @return the Constraint represented by this proxy, never null. */ - @objid ("fb7dc9e3-d887-4050-87b5-63602bd35666") @Override public Constraint getElement() { return (Constraint)super.getElement(); @@ -136,12 +127,10 @@ public Constraint getElement() { *

    Property description: *

    */ - @objid ("07c59139-9c3f-408c-9f82-d2757173fbff") public String getType() { return this.elt.getTagValue(OptionalStructuralVariation.MdaTypes.TYPE_TAGTYPE_ELT); } - @objid ("0e506a80-7f38-4219-ab81-a30082c88b4a") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -152,7 +141,6 @@ public int hashCode() { *

    Property description: *

    */ - @objid ("a6f55771-8e32-49b3-8a7a-1353944479de") public void setCondition(final String value) { this.elt.putTagValue(OptionalStructuralVariation.MdaTypes.CONDITION_TAGTYPE_ELT, value); } @@ -162,34 +150,25 @@ public void setCondition(final String value) { *

    Property description: *

    */ - @objid ("06d08811-0bde-495d-aa40-5ac5b6d1d7c4") public void setType(final String value) { this.elt.putTagValue(OptionalStructuralVariation.MdaTypes.TYPE_TAGTYPE_ELT, value); } - @objid ("e5b26b6a-b96b-4572-b415-a0f239f60d69") protected OptionalStructuralVariation(final Constraint elt) { super(elt); } - @objid ("d0e6beec-1084-40c0-9146-abfd5ccfa335") public static final class MdaTypes { - @objid ("36c7c132-ff38-4476-b4b8-ea6f376da08f") public static Stereotype STEREOTYPE_ELT; - @objid ("ebb863fc-6d64-493f-9216-fc5a629541c9") public static TagType TYPE_TAGTYPE_ELT; - @objid ("12e037d7-4168-4c01-9503-90a1cad7f373") public static TagType CONDITION_TAGTYPE_ELT; - @objid ("044f4f2e-0f2a-48dd-9002-c7e85ab7161c") private static Stereotype MDAASSOCDEP; - @objid ("a93fc9ea-2c6c-45da-ac0d-70fc1891cae6") private static TagType MDAASSOCDEP_ROLE; - @objid ("b59df01e-5b63-44ee-a577-67342c01c523") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "13a0bd3b-2d6c-4df9-8d0a-1e4f17868c20"); TYPE_TAGTYPE_ELT = ctx.getModelingSession().findElementById(TagType.class, "7195e113-ffdf-474f-bcfe-95c61934952f"); @@ -199,11 +178,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/Variation.java b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/Variation.java index d02dc8b..30ae809 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/Variation.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/api/variation/standard/constraint/Variation.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Objects; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.modelio.model.PropertyConverter; import org.modelio.api.module.context.IModuleContext; @@ -31,21 +30,16 @@ *

    Stereotype description: *

    */ -@objid ("fe58e23a-38c0-4755-8b26-f4f48f4e226d") public abstract class Variation { - @objid ("511b2552-c254-40ce-981c-232e1789d1c5") public static final String STEREOTYPE_NAME = "Variation"; - @objid ("99a45825-3666-4ae1-80fb-d32c667ee4c8") public static final String VARIATION_POINT_ID_TAGTYPE = "Variation_Point_ID"; /** * The underlying {@link Constraint} represented by this proxy, never null. */ - @objid ("f564e1bd-75e1-423f-81f5-df80beda3c74") protected final Constraint elt; - @objid ("41b2a0ba-380b-4b16-b4b6-2a6538caa38d") @Override public boolean equals(final Object obj) { if (this == obj) { @@ -62,10 +56,10 @@ public boolean equals(final Object obj) { } /** - * Get the underlying {@link Constraint}. + * Get the underlying {@link Constraint}. + * * @return the Constraint represented by this proxy, never null. */ - @objid ("16f709c5-4f32-4f82-8897-8fb8755e1fb2") public Constraint getElement() { return this.elt; } @@ -75,12 +69,10 @@ public Constraint getElement() { *

    Property description: *

    */ - @objid ("c7dc1bdb-1490-4b6d-b3bd-7f2e9a5ba1f8") public String getVariation_Point_ID() { return this.elt.getTagValue(Variation.MdaTypes.VARIATION_POINT_ID_TAGTYPE_ELT); } - @objid ("0e36d0a2-cebe-43f6-a3b9-671b166cafd7") @Override public int hashCode() { return 23 + ((this.elt == null) ? 0 : this.elt.hashCode()); @@ -91,31 +83,23 @@ public int hashCode() { *

    Property description: *

    */ - @objid ("441a7b31-44a0-4195-a61a-0899df57d601") public void setVariation_Point_ID(final String value) { this.elt.putTagValue(Variation.MdaTypes.VARIATION_POINT_ID_TAGTYPE_ELT, value); } - @objid ("4dbe37f7-0120-4123-a37a-4884729e416d") protected Variation(final Constraint elt) { this.elt = elt; } - @objid ("c51a1bfc-d91a-4484-8411-d8d912eae4df") public static final class MdaTypes { - @objid ("b2a4995d-3f95-4bcc-a170-eeea0e5c0a4e") public static Stereotype STEREOTYPE_ELT; - @objid ("e54f18b6-0fa6-4bfd-9894-0399d92f3a99") public static TagType VARIATION_POINT_ID_TAGTYPE_ELT; - @objid ("6d99d7b2-da99-4d9f-aee8-bd2b64add154") private static Stereotype MDAASSOCDEP; - @objid ("b1a561c8-f404-4582-9be8-56af8b394871") private static TagType MDAASSOCDEP_ROLE; - @objid ("cbd34b2a-3a51-40f6-a80c-a2ba017637a2") public static void init(final IModuleContext ctx) { STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "ebd3be3d-24ea-49d7-883f-58b3a3de118d"); VARIATION_POINT_ID_TAGTYPE_ELT = ctx.getModelingSession().findElementById(TagType.class, "5d2b918d-3d7f-4834-a3cc-761929978967"); @@ -124,11 +108,11 @@ public static void init(final IModuleContext ctx) { } - static { - if(VariabilityDesignerModule.getInstance() != null) { - init(VariabilityDesignerModule.getInstance().getModuleContext()); - } - } +static { + if(VariabilityDesignerModule.getInstance() != null) { + init(VariabilityDesignerModule.getInstance().getModuleContext()); + } + } } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/gui/VariationPanel.java b/src/main/java/org/modelio/module/variabilitydesigner/gui/VariationPanel.java index 6bf286a..ef7c47f 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/gui/VariationPanel.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/gui/VariationPanel.java @@ -1,13 +1,10 @@ package org.modelio.module.variabilitydesigner.gui; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; -@objid ("fbdc7df8-f401-4a51-9048-e60fe573e837") public class VariationPanel extends Composite { - @objid ("ee2f038d-679b-4994-bf35-efbc6b295118") public VariationPanel(Composite parent, int style) { super(parent, style); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/gui/VariationSelector.java b/src/main/java/org/modelio/module/variabilitydesigner/gui/VariationSelector.java index bbe3084..a13f7a9 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/gui/VariationSelector.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/gui/VariationSelector.java @@ -1,11 +1,8 @@ package org.modelio.module.variabilitydesigner.gui; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.swt.widgets.Composite; -@objid ("aaba279d-f36b-420c-85b0-77a3b5f112bd") public class VariationSelector extends Composite { - @objid ("4a151bad-7d5a-46e9-b4d4-fd97c8022174") public VariationSelector(Composite parent, int style) { super(parent, style); // TODO Auto-generated constructor stub diff --git a/src/main/java/org/modelio/module/variabilitydesigner/gui/report/IReportWriter.java b/src/main/java/org/modelio/module/variabilitydesigner/gui/report/IReportWriter.java index 1bfc2b6..d453f26 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/gui/report/IReportWriter.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/gui/report/IReportWriter.java @@ -1,29 +1,20 @@ package org.modelio.module.variabilitydesigner.gui.report; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.metamodel.uml.infrastructure.Element; -@objid ("606034b6-50dc-42d2-8bba-bb218d204939") public interface IReportWriter { - @objid ("808b2613-3651-4c85-87b7-6b118f4be363") void addWarning(String message, Element element, String description); - @objid ("a3d18678-139f-4021-97f0-b09da338b8ec") void addError(String message, Element element, String description); - @objid ("d4445b09-b17f-4a8e-b58d-4c8d355e4122") void addInfo(String message, Element element, String description); - @objid ("d02d87a7-7a7b-4d5a-b2ed-e8672fbdca84") boolean isEmpty(); - @objid ("258d7c03-3615-4f82-b689-e9c9247b6c38") boolean hasErrors(); - @objid ("98087c87-6453-4094-9cfe-c8f16732067e") boolean hasWarnings(); - @objid ("a195bf16-f2cc-4c29-9398-3aa2216292c3") boolean hasInfos(); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportDialog.java b/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportDialog.java index 0292388..24d3e04 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportDialog.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportDialog.java @@ -1,6 +1,5 @@ package org.modelio.module.variabilitydesigner.gui.report; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; @@ -23,43 +22,32 @@ /** * Dialog box used for the generation report. */ -@objid ("64e71244-bb58-4d16-b422-a25545148eea") class ReportDialog extends ModelioDialog { - @objid ("323fc053-350b-42f9-9fe0-d556b7922582") private ReportModel model; - @objid ("aac36c4d-f613-4f07-b578-955fda4f22f4") INavigationService navigationService; - @objid ("568e3868-2e8b-4b99-9420-5f59d7b2a10e") private Image warningImage; - @objid ("2bfca4f6-138b-4833-8437-ff9b2c1ee07e") private Image errorImage; - @objid ("4af28d1a-fd5c-4c43-be5b-5a7fdde3115e") Table table; - @objid ("4b8f2697-f98e-4cf9-9573-1d27b2f714d7") private Image infoImage; - @objid ("6b4ecdcd-cfd0-456b-8137-daada9394861") Text descriptionText; - @objid ("ddbff466-7505-47e0-aa4d-636f8f913b4e") public ReportDialog(Shell parentShell, final INavigationService iModelioNavigationService) { super (parentShell); setShellStyle (SWT.DIALOG_TRIM | getDefaultOrientation ()); this.navigationService = iModelioNavigationService; } - @objid ("d5ef34d7-9974-4c66-a384-dc978321bcfa") @Override public void addButtonsInButtonBar(Composite parent) { createButton (parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); } - @objid ("60a78450-9b56-45f1-9cae-633a4580fc69") @Override public Control createContentArea(Composite parent) { this.warningImage = JFaceResources.getImage ("dialog_message_warning_image"); @@ -136,7 +124,6 @@ public void mouseUp (MouseEvent e) { return parent; } - @objid ("d6423eca-cb49-4cab-b12e-93d515ef9746") private void updateViewFromModel() { if (this.table != null) { this.table.removeAll (); @@ -168,19 +155,16 @@ private void updateViewFromModel() { } } - @objid ("b4ed1857-83a1-4304-900b-6471af7544bf") public void setModel(ReportModel model) { this.model = model; updateViewFromModel (); } - @objid ("2cb99ddd-afea-42bf-89cd-41bf5c175e5a") public boolean isDisposed() { Shell s = getShell (); return s == null || s.isDisposed (); } - @objid ("bc1261df-b401-4415-892f-bb45d1a060cd") @Override public void init() { Shell shell = getShell (); @@ -192,7 +176,6 @@ public void init() { setMessage ("Message"); } - @objid ("26c515f6-79f5-444d-96bf-58066ffcdc54") @Override protected Point getInitialSize() { Point p = super.getInitialSize(); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportManager.java b/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportManager.java index bbebd7a..35b391e 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportManager.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportManager.java @@ -7,7 +7,6 @@ import java.text.DateFormat; import java.util.Calendar; import java.util.Locale; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; import org.modelio.api.modelio.navigation.INavigationService; @@ -20,9 +19,7 @@ * It provides all needed services and manages the relations between the report model and the report dialog. * @author ebrosse */ -@objid ("6738974c-18ad-4061-9bbd-af17eecb59c3") public class ReportManager { - @objid ("f6e7d865-88ee-4cfc-bd89-216c8e10055b") private static ReportDialog dialog; /** @@ -30,7 +27,6 @@ public class ReportManager { * * @param report : the report model exposed in report dialog */ - @objid ("5736d00c-d738-4b06-9cad-fee7f934574b") public static void showGenerationReport(final Shell shell, final ReportModel report, final INavigationService navServices) { if (report == null || report.isEmpty ()) { if (ReportManager.dialog != null && @@ -58,12 +54,10 @@ public static void showGenerationReport(final Shell shell, final ReportModel rep * * @return the created Report Model */ - @objid ("e3f1c2a8-cbca-4d69-9c52-a95174066687") public static ReportModel getNewReport() { return new ReportModel (); } - @objid ("a2eea58f-b719-4ebf-aae3-35e3806e1d0b") private static File getLogFile(String logFilePath) { File logFile = new File(logFilePath); @@ -77,7 +71,6 @@ private static File getLogFile(String logFilePath) { return logFile; } - @objid ("a92dd02d-f790-46a3-a4e0-6990d9257209") public static void writeReport(final ReportModel report, String logFilePath) { File logFile = getLogFile(logFilePath); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportModel.java b/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportModel.java index 73c2301..8cb2baa 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportModel.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/gui/report/ReportModel.java @@ -2,35 +2,28 @@ import java.util.Set; import java.util.TreeSet; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.metamodel.uml.infrastructure.Element; /** * This class represents the report model * @author ebrosse */ -@objid ("b06da73d-19c5-42b2-98ca-dbb918fe1172") public class ReportModel implements IReportWriter { - @objid ("d30e9c16-141a-4134-9b76-07df3b9eeed5") private Set errors; - @objid ("9fa436e7-f155-414b-b222-830ce7d2defe") private Set warnings; - @objid ("5089e421-1085-4e55-a580-4da684a75e01") private Set infos; /** * This default constructor initializes the lists of message (errors, warning and infos) */ - @objid ("dffaa1e0-4d64-481e-985c-04adf8792c87") public ReportModel() { this.errors = new TreeSet <> (); this.warnings = new TreeSet <> (); this.infos = new TreeSet <> (); } - @objid ("8922ca3e-a5ca-478f-9f89-386f0923d106") @Override public void addWarning(String message, Element element, String description) { if (message == null) { @@ -40,7 +33,6 @@ public void addWarning(String message, Element element, String description) { this.warnings.add (new ElementMessage (message, element, description)); } - @objid ("55e1f3f9-7d67-47c1-b629-3ec8734a388b") @Override public void addError(String message, Element element, String description) { if (message == null) { @@ -55,7 +47,6 @@ public void addError(String message, Element element, String description) { * * @return set of error message */ - @objid ("fba17ede-4b92-49e9-b6a9-ccbad54fa9cb") public Set getErrors() { return this.errors; } @@ -65,18 +56,15 @@ public Set getErrors() { * * @return set of warning message */ - @objid ("4dcbd483-2ddb-45b7-b989-ad22b0324dbe") public Set getWarnings() { return this.warnings; } - @objid ("8a847f04-0ba3-46b1-a07b-0fcf43dc332f") @Override public boolean isEmpty() { return !(hasErrors () || hasWarnings () || hasInfos ()); } - @objid ("0768b643-74a6-43c0-be40-fc422905ee2e") @Override public void addInfo(String message, Element element, String description) { this.infos.add (new ElementMessage (message, element, description)); @@ -87,48 +75,38 @@ public void addInfo(String message, Element element, String description) { * * @return set of info message */ - @objid ("d797cb80-4a7d-4d44-9b27-b38d0677a94d") public Set getInfos() { return this.infos; } - @objid ("10954675-55aa-44c4-b8d6-2d4d2653cebf") @Override public boolean hasErrors() { return !this.errors.isEmpty (); } - @objid ("c805037e-5f2d-4f99-a6e7-2e55933b91d0") @Override public boolean hasInfos() { return !this.infos.isEmpty (); } - @objid ("b5695152-e8b2-4982-bdf3-e867ebbf82a3") @Override public boolean hasWarnings() { return !this.warnings.isEmpty (); } - @objid ("c8cd31ef-39f6-4e53-be5c-1975724f9e72") class ElementMessage implements Comparable { - @objid ("004bae3c-6a99-4a9b-94d6-d97db96afd53") public String message; - @objid ("5ab1978f-de1e-4ef4-b818-0e0f224a779c") public String description; - @objid ("e15de550-2fd2-49a7-acff-10493c78dc36") public Element element; - @objid ("99c42d12-f552-46f5-ba66-59e94f379710") ElementMessage(final String message, final Element element, final String description) { this.message = message; this.element = element; this.description = description; } - @objid ("e6143fdc-e8ba-4ab2-96ca-7f64cd6e3b61") @Override public boolean equals(final Object obj) { if (this == obj) @@ -158,7 +136,6 @@ public boolean equals(final Object obj) { return true; } - @objid ("7ce21d40-132b-464d-9e63-a9ee4911c6e0") @Override public int compareTo(final ElementMessage anotherMessage) { if (this.element.equals(anotherMessage.element)) @@ -167,7 +144,6 @@ public int compareTo(final ElementMessage anotherMessage) { return 1; } - @objid ("c28e6e9e-b9cc-41bd-b2e2-bce344adf7a7") @Override public int hashCode() { final int prime = 31; @@ -179,7 +155,6 @@ public int hashCode() { return result; } - @objid ("ed9bbd1f-b3f4-4ed4-a1d2-13b9781c6eba") private ReportModel getOuterType() { return ReportModel.this; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CheckConformance.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CheckConformance.java index 6eb6c04..ed627e9 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CheckConformance.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CheckConformance.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.commands; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; import org.modelio.api.module.IModule; @@ -9,9 +8,7 @@ import org.modelio.api.module.context.IModuleContext; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("99e23c9d-347d-4792-b1b1-677b8a753934") public class CheckConformance extends DefaultModuleCommandHandler { - @objid ("ebd28d2d-bd6c-49cc-bf86-69e3dec50fa4") @Override public void actionPerformed(final List selectedElements, final IModule module) { // Module context is the link to many Modelio services @@ -21,7 +18,6 @@ public void actionPerformed(final List selectedElements, final IModule MessageDialog.openInformation(Display.getDefault().getActiveShell(), "check", "Command not implemented!"); } - @objid ("7df0a4cf-6d24-4c3e-bd76-c34db3915e47") @Override public boolean accept(final List selectedElements, final IModule module) { // Generated call to the super method will check the scope conditions defined in Studio. diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CreateANewVariantCommand.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CreateANewVariantCommand.java index 6afc2ca..80cae25 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CreateANewVariantCommand.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CreateANewVariantCommand.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.commands; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.IModule; import org.modelio.api.module.command.DefaultModuleCommandHandler; import org.modelio.api.module.context.IModuleContext; @@ -10,9 +9,7 @@ import org.modelio.module.variabilitydesigner.vel.imports.TrimmingDataGenerator; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("f916a2c4-0592-4779-8c12-2e9194f4e9db") public class CreateANewVariantCommand extends DefaultModuleCommandHandler { - @objid ("56be001e-90a4-4b16-a4a6-de911fceffcf") @Override public void actionPerformed(final List selectedElements, final IModule module) { // Module context is the link to many Modelio services @@ -32,7 +29,6 @@ public void actionPerformed(final List selectedElements, final IModule // } } - @objid ("e3347807-e9fb-478e-aff5-13f588920efa") @Override public boolean accept(final List selectedElements, final IModule module) { // Generated call to the super method will check the scope conditions defined in Studio. diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CreateAVariantCommand.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CreateAVariantCommand.java index 3e85033..0022b37 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CreateAVariantCommand.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/CreateAVariantCommand.java @@ -3,7 +3,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; @@ -17,9 +16,7 @@ import org.modelio.module.variabilitydesigner.vel.imports.TrimmingDataGenerator; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("7b6d914e-0a1a-4a83-9837-56a8f58bc91a") public class CreateAVariantCommand extends DefaultModuleCommandHandler { - @objid ("250ed63e-6f4d-45e0-864e-c30ab533d7ed") @Override public void actionPerformed(final List selectedElements, final IModule module) { // Module context is the link to many Modelio services @@ -36,7 +33,6 @@ public void actionPerformed(final List selectedElements, final IModule } } - @objid ("896fa075-6622-4796-b0fc-67953c164315") @Override public boolean accept(final List selectedElements, final IModule module) { // Generated call to the super method will check the scope conditions defined in Studio. @@ -51,7 +47,6 @@ public boolean accept(final List selectedElements, final IModule module return true; } - @objid ("d2cee1fb-b7d1-47fc-9283-14e0b40acf87") public List getFiles() { ArrayList res = new ArrayList<>(); FileDialog dialog = new FileDialog(Display.getDefault().getActiveShell(), SWT.MULTI); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/FeatureDiagram.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/FeatureDiagram.java index 00f36af..c06a6ff 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/FeatureDiagram.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/FeatureDiagram.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.commands; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.IModule; import org.modelio.api.module.command.standard.DiagramCreationStandardHandler; import org.modelio.metamodel.diagrams.AbstractDiagram; @@ -9,9 +8,7 @@ import org.modelio.module.variabilitydesigner.impl.VariabilityDesignerModule; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("5e8e574c-9c4a-4801-a429-d0e244b79378") public class FeatureDiagram extends DiagramCreationStandardHandler { - @objid ("1d67c7ce-9ad2-44e6-8c8a-2fe893ecb72f") @Override public boolean accept(final List selectedElements, final IModule module) { if (super.accept(selectedElements, module) == false) { @@ -20,7 +17,6 @@ public boolean accept(final List selectedElements, final IModule module return true; } - @objid ("11785627-1d84-44fe-a3a5-9754871ac211") @Override protected void postConfigureElement(final MObject newDiagram, final IModule module) { super.postConfigureElement(newDiagram, module); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVEL.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVEL.java index 68b4114..9396f45 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVEL.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVEL.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.commands; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; import org.modelio.api.module.IModule; @@ -9,9 +8,7 @@ import org.modelio.api.module.context.IModuleContext; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("29d178dd-ff53-4e53-b341-d0d5a51e016e") public class GenerateVEL extends DefaultModuleCommandHandler { - @objid ("d91e8a59-0b88-4f39-9e51-a0f2fa14fa17") @Override public void actionPerformed(final List selectedElements, final IModule module) { // Module context is the link to many Modelio services @@ -21,7 +18,6 @@ public void actionPerformed(final List selectedElements, final IModule MessageDialog.openInformation(Display.getDefault().getActiveShell(), "GenerateVEL", "Command not implemented!"); } - @objid ("6d017190-450f-4e7e-9589-36d9fe9257e2") @Override public boolean accept(final List selectedElements, final IModule module) { // Generated call to the super method will check the scope conditions defined in Studio. diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVELDescriptionFile.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVELDescriptionFile.java index 5aa6db8..7e99398 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVELDescriptionFile.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVELDescriptionFile.java @@ -6,7 +6,6 @@ import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; @@ -17,9 +16,7 @@ import org.modelio.module.variabilitydesigner.vel.generation.VariabilityModelGenerator; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("abb9be3b-7763-4f63-8248-b055c8cbc287") public class GenerateVELDescriptionFile extends DefaultModuleCommandHandler { - @objid ("13db60fa-f6ec-41a4-a850-59e0d5f73d3c") @Override public void actionPerformed(final List selectedElements, final IModule module) { VariabilityModelGenerator generator = new VariabilityModelGenerator(); @@ -49,7 +46,6 @@ public void actionPerformed(final List selectedElements, final IModule } } - @objid ("f9569078-af9b-4192-a7e7-eb6ea155a393") @Override public boolean accept(final List selectedElements, final IModule module) { // Generated call to the super method will check the scope conditions defined in Studio. diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVELVariant.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVELVariant.java index 862a872..3b61d9c 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVELVariant.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/GenerateVELVariant.java @@ -6,7 +6,6 @@ import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; @@ -17,9 +16,7 @@ import org.modelio.module.variabilitydesigner.vel.generation.VariabilityModelGenerator; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("bf59e424-e648-4f7c-8471-31973b2c4afa") public class GenerateVELVariant extends DefaultModuleCommandHandler { - @objid ("0965e5bc-b607-4296-8ce6-d491091905e1") @Override public void actionPerformed(final List selectedElements, final IModule module) { VariabilityModelGenerator generator = new VariabilityModelGenerator(); @@ -49,7 +46,6 @@ public void actionPerformed(final List selectedElements, final IModule } } - @objid ("8f353737-dc67-4716-a1e0-9e2fbfc94e28") @Override public boolean accept(final List selectedElements, final IModule module) { // Generated call to the super method will check the scope conditions defined in Studio. diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/ImportVELVariant.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/ImportVELVariant.java index 4a9396e..0b2e356 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/ImportVELVariant.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/ImportVELVariant.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.commands; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; import org.modelio.api.module.IModule; @@ -9,9 +8,7 @@ import org.modelio.api.module.context.IModuleContext; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("7afd18a6-50c4-41a7-a18d-3399f4a504bc") public class ImportVELVariant extends DefaultModuleCommandHandler { - @objid ("76a8c5f7-e697-49a7-97d6-9591e434b6af") @Override public void actionPerformed(final List selectedElements, final IModule module) { // Module context is the link to many Modelio services @@ -21,7 +18,6 @@ public void actionPerformed(final List selectedElements, final IModule MessageDialog.openInformation(Display.getDefault().getActiveShell(), "GenerateVEL", "Command not implemented!"); } - @objid ("1f57130a-ea30-4600-a440-8bb2baa78f01") @Override public boolean accept(final List selectedElements, final IModule module) { // Generated call to the super method will check the scope conditions defined in Studio. diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/RootFeature.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/RootFeature.java index cb29c7c..7676466 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/RootFeature.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/RootFeature.java @@ -1,14 +1,11 @@ package org.modelio.module.variabilitydesigner.handlers.commands; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.IModule; import org.modelio.api.module.command.standard.ElementCreationStandardHandler; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("4cd955d5-11cc-472c-b656-4407d4ecbb75") public class RootFeature extends ElementCreationStandardHandler { - @objid ("96bb09d7-af57-4d10-9398-98d2ceee87e9") @Override public boolean accept(final List selectedElements, final IModule module) { // Generated call to the super method will check the scope conditions defined in Studio. @@ -20,7 +17,6 @@ public boolean accept(final List selectedElements, final IModule module return true; } - @objid ("ee0ec86e-9f1e-46ea-a012-fe221d7d4149") @Override protected void postConfigureElement(final MObject newElement, final IModule module) { // This method is a hook called once the element is created and configured and before the transaction is committed. diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/VariabilityMatrix.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/VariabilityMatrix.java new file mode 100644 index 0000000..4023353 --- /dev/null +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/VariabilityMatrix.java @@ -0,0 +1,58 @@ +package org.modelio.module.variabilitydesigner.handlers.commands; + +import java.util.List; +import org.modelio.api.modelio.model.IModelingSession; +import org.modelio.api.modelio.model.ITransaction; +import org.modelio.api.module.IModule; +import org.modelio.api.module.command.DefaultModuleCommandHandler; +import org.modelio.metamodel.uml.infrastructure.ModelElement; +import org.modelio.metamodel.uml.infrastructure.matrix.MatrixDefinition; +import org.modelio.module.variabilitydesigner.api.feature.infrastructure.matrixdefinition.VariantDefinition; +import org.modelio.module.variabilitydesigner.impl.VariabilityDesignerPeerModule; +import org.modelio.vcore.smkernel.mapi.MObject; + +public class VariabilityMatrix extends DefaultModuleCommandHandler { + @Override + public void actionPerformed(final List selectedElements, final IModule module) { + ModelElement selected = (ModelElement) selectedElements.get(0); + IModelingSession modelingSession = module.getModuleContext().getModelingSession(); + + try (ITransaction t = modelingSession.createTransaction("Create variability matrix")) { + + createMatrix(selected, modelingSession); + t.commit(); + } + } + + @Override + public boolean accept(final List selectedElements, final IModule module) { + if (super.accept(selectedElements, module) == false) { + return false; + } + return true; + } + + public MatrixDefinition createMatrix(final ModelElement selected, final IModelingSession modelingSession) { + MatrixDefinition matrix = modelingSession.getModel().createMatrixDefinition(); + matrix.setName("Variability Matrix "); + matrix.addStereotype(VariabilityDesignerPeerModule.MODULE_NAME, VariantDefinition.STEREOTYPE_NAME); + matrix.setOwner(selected); + + // Use a standard query for lines + // + // QueryDefinition lineQuery = modelingSession.getModel().createQueryDefinition(IVariabilityDesignerPeerModule.MODULE_NAME, SourceAllocationQuery.class.getName()); + // lineQuery.setUsingAdditions(true); + // matrix.setLinesDefinition(lineQuery); + // + // // Use a custom query for columns + // QueryDefinition targetQuery = modelingSession.getModel().createQueryDefinition(IVariabilityDesignerPeerModule.MODULE_NAME, TargetAllocationQuery.class.getName()); + // targetQuery.setUsingAdditions(true); + // matrix.setColumnsDefinition(targetQuery); + // + // // Use a standard value definition + // MatrixValueDefinition valueDefinition = modelingSession.getModel().createMatrixValueDefinition(IVariabilityDesignerPeerModule.MODULE_NAME, LinkAsImageReadOnlyContextAccessor.class.getName()); + // matrix.setValuesDefinition(valueDefinition); + return matrix; + } + +} diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/addVariationPoint.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/addVariationPoint.java new file mode 100644 index 0000000..5d7ea16 --- /dev/null +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/commands/addVariationPoint.java @@ -0,0 +1,32 @@ +package org.modelio.module.variabilitydesigner.handlers.commands; + +import java.util.List; +import org.modelio.api.module.IModule; +import org.modelio.api.module.command.standard.ElementCreationStandardHandler; +import org.modelio.vcore.smkernel.mapi.MObject; + +public class addVariationPoint extends ElementCreationStandardHandler { + @Override + public boolean accept(final List selectedElements, final IModule module) { + // Generated call to the super method will check the scope conditions defined in Studio. + // Do not remove this call unless you need to take full control on the checks to be carried out. + // However you can safely extends the checked conditions by adding custom code. + if (super.accept(selectedElements, module) == false) { + return false; + } + return true; + } + + @Override + protected void postConfigureElement(final MObject newElement, final IModule module) { + // This method is a hook called once the element is created and configured and before the transaction is committed. + // The super method should be first called in most cases. + // Sub classes may redefine this method to make additional modifications. + + // Call the super method + super.postConfigureElement(newElement, module); + + // TODO Add additional behavior below + } + +} diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/FeaturePropertyPage.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/FeaturePropertyPage.java index fe23166..667719d 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/FeaturePropertyPage.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/FeaturePropertyPage.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.propertiesPage.IModulePropertyTable; import org.modelio.metamodel.uml.infrastructure.ModelElement; import org.modelio.module.variabilitydesigner.api.IVariabilityDesignerPeerModule; @@ -12,12 +11,9 @@ import org.modelio.module.variabilitydesigner.api.feature.standard.class_.OrFeature; import org.modelio.module.variabilitydesigner.i18n.Messages; -@objid ("20b8dec4-57bd-4517-92a3-d962e9288d36") public class FeaturePropertyPage implements IPropertyContent { - @objid ("5212e8aa-9232-42a3-83cb-26725f727f35") private static List sterNames = new ArrayList<>(); - @objid ("7fb70a7a-f56f-4b6d-a58b-d949005707ed") @Override public int changeProperty(ModelElement element, int row, String value) { if(row==1) { @@ -37,7 +33,6 @@ public int changeProperty(ModelElement element, int row, String value) { return 1; } - @objid ("302ddc9f-64e9-49af-9c07-e779c8118e7f") @Override public void update(ModelElement element, IModulePropertyTable table) { /* diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/IPropertyContent.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/IPropertyContent.java index 6c5c9aa..df754c3 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/IPropertyContent.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/IPropertyContent.java @@ -28,7 +28,6 @@ **/ package org.modelio.module.variabilitydesigner.handlers.propertypage; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.propertiesPage.IModulePropertyTable; import org.modelio.metamodel.uml.infrastructure.ModelElement; @@ -36,7 +35,6 @@ * This interface defines the contract of all property pages * @author ebrosse */ -@objid ("a16e4f11-2c7c-4d0c-ab98-ead307ed5f20") public interface IPropertyContent { /** * This method handles the changes of the given property, identified by its row index, of a selected element @@ -46,7 +44,6 @@ public interface IPropertyContent { * @param row : the row of the changed property * @param value : the new value of the property */ - @objid ("57765668-a646-4fcc-97a0-a7077bc884e5") int changeProperty(ModelElement element, int row, String value); /** @@ -55,7 +52,6 @@ public interface IPropertyContent { * * @param table : the property table to fulfill */ - @objid ("c9b61c8e-f577-4798-9f26-4c5b250b2bc0") void update(ModelElement element, IModulePropertyTable table); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/ModelElementPropertyPage.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/ModelElementPropertyPage.java index ca814ef..d77d2b2 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/ModelElementPropertyPage.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/ModelElementPropertyPage.java @@ -1,13 +1,10 @@ package org.modelio.module.variabilitydesigner.handlers.propertypage; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.propertiesPage.IModulePropertyTable; import org.modelio.metamodel.uml.infrastructure.ModelElement; import org.modelio.module.variabilitydesigner.i18n.Messages; -@objid ("3b94114e-3414-4485-b142-c50a071370fc") public class ModelElementPropertyPage implements IPropertyContent { - @objid ("f8edfea4-8afa-4ddc-b3e1-6c5030db4814") @Override public int changeProperty(ModelElement element, int row, String value) { if(row==1) { @@ -16,7 +13,6 @@ public int changeProperty(ModelElement element, int row, String value) { return 1; } - @objid ("d884ee57-22d6-4ee1-b0e1-ad619fc9a981") @Override public void update(ModelElement element, IModulePropertyTable table) { /* diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/NamedPropertyPage.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/NamedPropertyPage.java index 785a1f9..9c68d8e 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/NamedPropertyPage.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/NamedPropertyPage.java @@ -1,13 +1,10 @@ package org.modelio.module.variabilitydesigner.handlers.propertypage; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.propertiesPage.IModulePropertyTable; import org.modelio.metamodel.uml.infrastructure.ModelElement; import org.modelio.module.variabilitydesigner.i18n.Messages; -@objid ("7951d59f-66f5-4acd-85c0-befe590a7fe4") public class NamedPropertyPage implements IPropertyContent { - @objid ("d8606ede-ab61-4971-9a72-8db3c613e343") @Override public int changeProperty(ModelElement element, int row, String value) { if(row==1) { @@ -16,7 +13,6 @@ public int changeProperty(ModelElement element, int row, String value) { return 1; } - @objid ("bec412f8-a840-439f-93e1-3fd0b1cee6ba") @Override public void update(ModelElement element, IModulePropertyTable table) { /* diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/NotFeaturePropertyPage.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/NotFeaturePropertyPage.java index bd3e081..4200437 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/NotFeaturePropertyPage.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/NotFeaturePropertyPage.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.propertiesPage.IModulePropertyTable; import org.modelio.metamodel.uml.infrastructure.Dependency; import org.modelio.metamodel.uml.infrastructure.ModelElement; @@ -14,15 +13,11 @@ import org.modelio.module.variabilitydesigner.i18n.Messages; import org.modelio.module.variabilitydesigner.impl.VariabilityDesignerModule; -@objid ("20180d3f-aea8-40d8-8961-9565cc0c8eca") public class NotFeaturePropertyPage implements IPropertyContent { - @objid ("ba4d7b31-b750-43a3-98e7-6b948b943caa") private static List names = new ArrayList<>(); - @objid ("5d76f753-d5db-4450-8536-f324489db00a") private static List features = new ArrayList<>(); - @objid ("65037746-9182-4d04-8e3f-fa7069a5e77d") @Override public int changeProperty(ModelElement element, int row, String value) { if(row == 1) { @@ -40,7 +35,6 @@ public int changeProperty(ModelElement element, int row, String value) { return 1; } - @objid ("269eb13d-6944-4a4a-aae1-abb9b33985b5") @Override public void update(ModelElement element, IModulePropertyTable table) { /* diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/VariabilityPropertyManager.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/VariabilityPropertyManager.java index 39e9efc..ea43135 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/VariabilityPropertyManager.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/VariabilityPropertyManager.java @@ -1,6 +1,5 @@ package org.modelio.module.variabilitydesigner.handlers.propertypage; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.propertiesPage.IModulePropertyTable; import org.modelio.metamodel.uml.infrastructure.ModelElement; import org.modelio.module.variabilitydesigner.api.IVariabilityDesignerPeerModule; @@ -9,12 +8,10 @@ import org.modelio.module.variabilitydesigner.api.feature.standard.class_.OptionalFeature; import org.modelio.module.variabilitydesigner.api.feature.standard.class_.OrFeature; -@objid ("8ab9d56a-71e9-43ee-9132-3b1b8ec19f6e") public class VariabilityPropertyManager { /** * @return */ - @objid ("11c24b45-4ec7-4fd0-9961-42437d07d722") public int changeProperty(ModelElement element, int row, String value) { IPropertyContent propertyPage = null; @@ -33,7 +30,6 @@ public int changeProperty(ModelElement element, int row, String value) { return currentRow; } - @objid ("0300d54d-0cc2-44e1-bfce-c96275ee0b8c") public void update(ModelElement element, IModulePropertyTable table) { IPropertyContent propertyPage = null; @@ -49,7 +45,6 @@ public void update(ModelElement element, IModulePropertyTable table) { } } - @objid ("229cb906-561d-4f08-890d-8023afa4dbc7") private boolean isFeature(ModelElement element) { return (element.isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, MandatoryFeature.STEREOTYPE_NAME)) || (element.isStereotyped(IVariabilityDesignerPeerModule.MODULE_NAME, OptionalFeature.STEREOTYPE_NAME)) diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/VariabilityPropertyPage.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/VariabilityPropertyPage.java index 4409478..7fc3a9c 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/VariabilityPropertyPage.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/propertypage/VariabilityPropertyPage.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.propertypage; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.IModule; import org.modelio.api.module.propertiesPage.AbstractModulePropertyPage; import org.modelio.api.module.propertiesPage.IModulePropertyTable; @@ -11,14 +10,11 @@ /** * @author kchaabouni */ -@objid ("d73af64a-0b9a-4430-adf8-3545cd8709d1") public class VariabilityPropertyPage extends AbstractModulePropertyPage { - @objid ("25d90fc8-495f-4e38-bad4-539a3cae53df") public VariabilityPropertyPage(IModule module, String name, String label, String bitmap) { super(module, name, label, bitmap); } - @objid ("031bd44d-be96-4fec-8b04-916634c3621c") @Override public void changeProperty(List selectedElements, int row, String value) { if ((selectedElements != null) && (selectedElements.size() > 0) && (selectedElements.get(0) instanceof ModelElement)){ @@ -31,7 +27,6 @@ public void changeProperty(List selectedElements, int row, String value } } - @objid ("19815ef7-f4f7-4fa6-bfe7-98fdcc2debb9") @Override public void update(List selectedElements, IModulePropertyTable table) { if ((selectedElements != null) && (selectedElements.size() > 0) diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddAlternativeParameterVariationTool.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddAlternativeParameterVariationTool.java index c5b720e..0eeeb79 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddAlternativeParameterVariationTool.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddAlternativeParameterVariationTool.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.tools; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.draw2d.geometry.Rectangle; import org.modelio.api.modelio.diagram.IDiagramGraphic; import org.modelio.api.modelio.diagram.IDiagramHandle; @@ -11,27 +10,22 @@ import org.modelio.module.variabilitydesigner.api.VariabilityDesignerStereotypes; import org.modelio.module.variabilitydesigner.utils.DiagramToolsUtils; -@objid ("dcaf5d20-4f02-41bc-b06a-fe3b12b37174") public class AddAlternativeParameterVariationTool extends DefaultMultiLinkTool { - @objid ("f9fe71c1-8afc-4742-a83a-e208239071a1") @Override public boolean acceptFirstElement(final IDiagramHandle diagramHandle, final IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("b32b363e-ab2f-4c61-bf5f-24dc0cb06af2") @Override public boolean acceptAdditionalElement(final IDiagramHandle diagramHandle, final List previousNodes, final IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("21271d2d-1506-4637-bba7-ba53babf313e") @Override public boolean acceptLastElement(final IDiagramHandle diagramHandle, final List otherNodes, final IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("ab13e9cc-edc1-4dc7-a98a-d7db854224dc") @Override public void actionPerformed(final IDiagramHandle diagramHandle, final IDiagramGraphic lastNode, final List otherNodes, final List routerKinds, final List paths, final Rectangle rectangle) { DiagramToolsUtils.constraintCreation(this, VariabilityDesignerStereotypes.ALTERNATIVE_PARAMETER, diagramHandle, lastNode, otherNodes, routerKinds, paths, rectangle); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddAlternativeVariationTool.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddAlternativeVariationTool.java index f48b9ba..f2522ac 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddAlternativeVariationTool.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddAlternativeVariationTool.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.tools; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.draw2d.geometry.Rectangle; import org.modelio.api.modelio.diagram.IDiagramGraphic; import org.modelio.api.modelio.diagram.IDiagramHandle; @@ -11,27 +10,22 @@ import org.modelio.module.variabilitydesigner.api.VariabilityDesignerStereotypes; import org.modelio.module.variabilitydesigner.utils.DiagramToolsUtils; -@objid ("17c7b606-7a33-4b15-a06f-639ed3183c4e") public class AddAlternativeVariationTool extends DefaultMultiLinkTool { - @objid ("7e0d89b5-faed-44ff-adc4-d98630d8831e") @Override public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic lastNode, List otherNodes, List routerKinds, List paths, Rectangle rectangle) { DiagramToolsUtils.constraintCreation(this,VariabilityDesignerStereotypes.AlTERNATIVE_STRUCTURAL, diagramHandle, lastNode, otherNodes, routerKinds, paths, rectangle); } - @objid ("e114513e-8bab-4c15-9195-53eba8edf72b") @Override public boolean acceptFirstElement(IDiagramHandle diagramHandle, IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("0a8e64df-6547-4e24-a4e8-cba3cc6195a8") @Override public boolean acceptAdditionalElement(IDiagramHandle diagramHandle, List previousNodes, IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("1c230fac-b399-4548-9113-b8bf6110e5ac") @Override public boolean acceptLastElement(IDiagramHandle diagramHandle, List otherNodes, IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddCalculatedParameterVariationTool.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddCalculatedParameterVariationTool.java index 8b3eaf6..c483f68 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddCalculatedParameterVariationTool.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddCalculatedParameterVariationTool.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.tools; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.draw2d.geometry.Rectangle; import org.modelio.api.modelio.diagram.IDiagramGraphic; import org.modelio.api.modelio.diagram.IDiagramHandle; @@ -11,27 +10,22 @@ import org.modelio.module.variabilitydesigner.api.VariabilityDesignerStereotypes; import org.modelio.module.variabilitydesigner.utils.DiagramToolsUtils; -@objid ("c0a0a823-2a37-4443-ba74-bf0a52599a55") public class AddCalculatedParameterVariationTool extends DefaultMultiLinkTool { - @objid ("304e5b3e-d75b-4934-8f18-68268f50984f") @Override public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic lastNode, List otherNodes, List routerKinds, List paths, Rectangle rectangle) { DiagramToolsUtils.constraintCreation(this,VariabilityDesignerStereotypes.CALCULATED_PARAMETER, diagramHandle, lastNode, otherNodes, routerKinds, paths, rectangle); } - @objid ("7b407e79-3781-47cf-b453-72ea336749df") @Override public boolean acceptFirstElement(IDiagramHandle diagramHandle, IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("65538cb3-6583-498f-a384-dd792b1c801a") @Override public boolean acceptAdditionalElement(IDiagramHandle diagramHandle, List previousNodes, IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("b1376f3e-26d0-4968-a82a-dd399359fb9a") @Override public boolean acceptLastElement(IDiagramHandle diagramHandle, List otherNodes, IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddOptionalVariationTool.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddOptionalVariationTool.java index cda6ae5..1b8bcfb 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddOptionalVariationTool.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/AddOptionalVariationTool.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.handlers.tools; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.draw2d.geometry.Rectangle; import org.modelio.api.modelio.diagram.IDiagramGraphic; import org.modelio.api.modelio.diagram.IDiagramHandle; @@ -11,27 +10,22 @@ import org.modelio.module.variabilitydesigner.api.VariabilityDesignerStereotypes; import org.modelio.module.variabilitydesigner.utils.DiagramToolsUtils; -@objid ("6da5f91b-c1cc-4dbe-a8a7-7661155a327a") public class AddOptionalVariationTool extends DefaultMultiLinkTool { - @objid ("8f786f15-af95-4812-959c-a422d488c2c0") @Override public boolean acceptFirstElement(final IDiagramHandle diagramHandle, final IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("5e36827c-0c93-4ed2-a298-c35248e72741") @Override public boolean acceptAdditionalElement(final IDiagramHandle diagramHandle, final List previousNodes, final IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("4ab93a62-641f-464d-825e-b9d1967c4da0") @Override public boolean acceptLastElement(final IDiagramHandle diagramHandle, final List otherNodes, final IDiagramGraphic targetNode) { return DiagramToolsUtils.acceptElement(this, diagramHandle, targetNode); } - @objid ("544917ae-05c8-4c15-87b5-0a5f499225c8") @Override public void actionPerformed(final IDiagramHandle diagramHandle, final IDiagramGraphic lastNode, final List otherNodes, final List routerKinds, final List paths, final Rectangle rectangle) { DiagramToolsUtils.constraintCreation(this, VariabilityDesignerStereotypes.OPTIONAL_STRUCTURAL, diagramHandle, lastNode, otherNodes, routerKinds, paths, rectangle); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/MandatoryFeatureTool.java b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/MandatoryFeatureTool.java index 8aa79b3..c8203b4 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/MandatoryFeatureTool.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/handlers/tools/MandatoryFeatureTool.java @@ -1,6 +1,5 @@ package org.modelio.module.variabilitydesigner.handlers.tools; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.modelio.api.modelio.diagram.IDiagramGraphic; @@ -16,19 +15,15 @@ import org.modelio.module.variabilitydesigner.impl.VariabilityDesignerModule; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("771b80c1-edf9-479f-9700-e02352c7b7b0") public class MandatoryFeatureTool extends DefaultAttachedBoxTool { - @objid ("2e40df83-10dd-449e-a35a-854d7bc21265") private MObject owner; - @objid ("97fc3530-b77b-4baf-8c15-f74090de6751") @Override public boolean acceptElement(final IDiagramHandle diagramHandle, final IDiagramGraphic targetNode) { owner = targetNode.getElement(); return true; } - @objid ("69b03e4c-a94a-45ba-8667-161cd64b0f09") public void actionPerformed(final IDiagramHandle diagramHandle, final IDiagramGraphic parent, final Rectangle rect) { IModelingSession session = VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession(); try( ITransaction transaction = session.createTransaction ("Mandatory Feature")){ @@ -59,7 +54,6 @@ public void actionPerformed(final IDiagramHandle diagramHandle, final IDiagramGr } } - @objid ("d2ee9ac9-e148-4651-b177-820fbffe4a13") @Override public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic arg1, LinkRouterKind arg2, ILinkPath arg3, Point point) { IModelingSession session = VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession(); @@ -90,7 +84,6 @@ public void actionPerformed(IDiagramHandle diagramHandle, IDiagramGraphic arg1, } } - @objid ("6ba14698-1a8b-404c-b6f9-85bf83f9598b") @Override public void actionPerformedInDiagram(IDiagramHandle diagramHandle, Rectangle rect) { IModelingSession session = VariabilityDesignerModule.getInstance().getModuleContext().getModelingSession(); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/i18n/Messages.java b/src/main/java/org/modelio/module/variabilitydesigner/i18n/Messages.java index 0c4e60d..96efe51 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/i18n/Messages.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/i18n/Messages.java @@ -3,18 +3,13 @@ import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.modeliosoft.modelio.javadesigner.annotations.objid; -@objid ("b99a64de-3a1e-4403-85e7-059289baa3b1") public class Messages { - @objid ("a981e069-187c-4a13-adf0-69c6bec12c42") private static ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle ("org.modelio.module.variabilitydesigner.i18n.messages"); - @objid ("8582b861-e842-412d-90a4-3bf856859a73") private Messages() { } - @objid ("a302a0da-41d1-4840-bd79-9cb813d93938") public static String getString(final String key) { try { return RESOURCE_BUNDLE.getString (key); @@ -23,7 +18,6 @@ public static String getString(final String key) { } } - @objid ("3bb6d709-8059-441d-a271-4b25ae08188c") public static String getString(final String key, final String... params) { try { return MessageFormat.format (RESOURCE_BUNDLE.getString (key),(Object[]) params); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerLifeCycleHandler.java b/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerLifeCycleHandler.java index e18ac14..39f0129 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerLifeCycleHandler.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerLifeCycleHandler.java @@ -1,25 +1,20 @@ package org.modelio.module.variabilitydesigner.impl; import java.util.Map; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.lifecycle.DefaultModuleLifeCycleHandler; import org.modelio.api.module.lifecycle.ModuleException; import org.modelio.vbasic.version.Version; -@objid ("5939b2a0-9a02-44bd-87bb-2a387d6e9e79") public class VariabilityDesignerLifeCycleHandler extends DefaultModuleLifeCycleHandler { - @objid ("d95648e1-7c02-4efc-8261-6158b6501110") public VariabilityDesignerLifeCycleHandler(final VariabilityDesignerModule module) { super(module); } - @objid ("74fefdc5-c6f6-4762-a286-a6f57c7e9a25") @Override public boolean start() throws ModuleException { return super.start(); } - @objid ("cfc72e3e-3825-4162-89fb-0bbd3c27d69c") @Override public void stop() throws ModuleException { super.stop(); @@ -28,18 +23,15 @@ public void stop() throws ModuleException { /** * @return */ - @objid ("6b07d726-abb7-4a01-843e-213af29f1dff") public static boolean install(final String modelioPath, final String mdaPath) throws ModuleException { return DefaultModuleLifeCycleHandler.install(modelioPath, mdaPath); } - @objid ("c9614fef-e5eb-4458-b0fe-edc05b52f6c8") @Override public boolean select() throws ModuleException { return super.select(); } - @objid ("750132c4-b13c-4c8d-895e-343a52f62136") @Override public void upgrade(final Version oldVersion, final Map oldParameters) throws ModuleException { Version lastVersion = new Version("2.1.10"); @@ -47,7 +39,6 @@ public void upgrade(final Version oldVersion, final Map oldParam } } - @objid ("e030d54e-16b0-4fe5-b89a-f43bb577d11b") @Override public void unselect() throws ModuleException { super.unselect(); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerLogService.java b/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerLogService.java index 45c0770..a94d54e 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerLogService.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerLogService.java @@ -1,18 +1,14 @@ package org.modelio.module.variabilitydesigner.impl; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.context.log.ILogService; /** * Proxy for the Modelio {@link ILogService}, configuring the * ModelingWizardMdac. */ -@objid ("1daf5ad2-465b-4430-884f-cbe03fb5d247") public class VariabilityDesignerLogService { - @objid ("2753d3ec-83ca-4bc7-beb2-2f0a70fe9504") private VariabilityDesignerModule module; - @objid ("4d99e2e7-089f-4f69-a78f-861e12556c62") private ILogService logService; /** @@ -21,7 +17,6 @@ public class VariabilityDesignerLogService { * @param logService the Modelio log service. * @param module the current instance of {@link VariabilityDesignerModule }. */ - @objid ("a0dabfd6-14c8-4bcf-bda4-1ede89e0e989") public VariabilityDesignerLogService(final ILogService logService, final VariabilityDesignerModule module) { this.logService = logService; this.module = module; @@ -36,7 +31,6 @@ public VariabilityDesignerLogService(final ILogService logService, final Variabi * * @param msg a message to be displayed as a log. */ - @objid ("69e7d2f4-7cf4-4e2b-9086-3ba53a2c4123") public void info(final String msg) { this.logService.info(msg); } @@ -50,7 +44,6 @@ public void info(final String msg) { * * @param msg a message to be displayed as a log. */ - @objid ("a215c550-c187-472f-85b8-bf585830c3ce") public void warning(final String msg) { this.logService.warning(msg); } @@ -64,7 +57,6 @@ public void warning(final String msg) { * * @param msg a message to be displayed as a log. */ - @objid ("61d88649-3bb3-43cb-b172-b0900ffd5ed3") public void error(final String msg) { this.logService.error(msg); } @@ -78,7 +70,6 @@ public void error(final String msg) { * @param t * an exception to be displayed as a log. */ - @objid ("20335478-280a-4df5-9fa1-7c134cb736de") public void info(final Throwable e) { this.logService.info(e); } @@ -92,7 +83,6 @@ public void info(final Throwable e) { * @param t * an exception to be displayed as a log. */ - @objid ("f40803db-3421-45f9-81b0-6d03f64a9347") public void warning(final Throwable e) { this.logService.warning(e); } @@ -106,7 +96,6 @@ public void warning(final Throwable e) { * @param t * an exception to be displayed as a log. */ - @objid ("e51fd045-e428-4758-84a8-349e34293467") public void error(final Throwable e) { this.logService.error(e); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerModule.java b/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerModule.java index a293651..bd14471 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerModule.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerModule.java @@ -1,6 +1,5 @@ package org.modelio.module.variabilitydesigner.impl; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.AbstractJavaModule; import org.modelio.api.module.context.IModuleContext; import org.modelio.api.module.lifecycle.IModuleLifeCycleHandler; @@ -8,24 +7,17 @@ import org.modelio.api.module.parameter.IParameterEditionModel; import org.modelio.metamodel.uml.infrastructure.Stereotype; -@objid ("62b421ec-29ed-4333-b0b2-1dd482358b58") public class VariabilityDesignerModule extends AbstractJavaModule { - @objid ("c7b35baa-9ad8-4f48-becf-870d5e960e9f") private static final String MODULE_IMAGE = "/res/icon/module.png"; - @objid ("02ac28f3-6f37-4ff9-afde-6da4e7bee78d") private VariabilityDesignerPeerModule peerModule = null; - @objid ("97769614-0bef-4e64-a384-cfad61697235") private VariabilityDesignerLifeCycleHandler lifeCycleHandler = null; - @objid ("44795858-f38e-4579-8cd1-b85f84f8a96e") private static VariabilityDesignerModule instance; - @objid ("c11dd7a2-51fc-4fdd-8cff-7b9ff153147a") public static VariabilityDesignerLogService logService; - @objid ("8b03c5e8-c494-4617-9fd3-9e96dc46c74d") public VariabilityDesignerModule(final IModuleContext moduleContext) { super(moduleContext); @@ -36,7 +28,6 @@ public VariabilityDesignerModule(final IModuleContext moduleContext) { init(); } - @objid ("1b6043d7-cf4c-45fa-8cf5-2520826a5e47") @Override public VariabilityDesignerPeerModule getPeerModule() { return this.peerModule; @@ -45,7 +36,6 @@ public VariabilityDesignerPeerModule getPeerModule() { /** * Return the LifeCycleHandler attached to the current module. This handler is used to manage the module lifecycle by declaring the desired implementation for the start, select... methods. */ - @objid ("a0b7a237-435e-418f-82a9-9d2cdd872841") @Override public IModuleLifeCycleHandler getLifeCycleHandler() { return this.lifeCycleHandler; @@ -56,25 +46,21 @@ public IModuleLifeCycleHandler getLifeCycleHandler() { * of the MDA lifecycle and constructor implementation is not accessible to the module developer. The init method * allows the developer to execute the desired initialization. */ - @objid ("56121267-a7e3-4ab5-943e-30acb7037c54") @Override public IParameterEditionModel getParametersEditionModel() { return super.getParametersEditionModel(); } - @objid ("1d22eac5-06cf-4ebc-9168-05cee95f1f88") @Override public String getModuleImagePath() { return VariabilityDesignerModule.MODULE_IMAGE; } - @objid ("8164d50b-4c64-426d-9ef5-015e2653f04a") public static VariabilityDesignerModule getInstance() { // Automatically generated method. Please delete this comment before entering specific code. return instance; } - @objid ("5975da8d-7833-420a-8750-d4a43139e0c2") @Override public IMdaExpert getMdaExpert(final Stereotype st) { // Generated code, please do not remove it @@ -91,10 +77,9 @@ public IMdaExpert getMdaExpert(final Stereotype st) { * @param st a stereotype owned by the current module. * @return a MDA expert belonging to the MDA API or null. */ - @objid ("e244be3d-0739-4952-9ccb-3ece200836a6") private IMdaExpert getGeneratedMdaExpert(final Stereotype st) { switch (st.getUuid()) { - default: return null; + default: return null; } } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerPeerModule.java b/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerPeerModule.java index 8cdf60e..2e9865a 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerPeerModule.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/impl/VariabilityDesignerPeerModule.java @@ -1,45 +1,35 @@ package org.modelio.module.variabilitydesigner.impl; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.module.context.configuration.IModuleAPIConfiguration; import org.modelio.module.variabilitydesigner.api.IVariabilityDesignerPeerModule; import org.modelio.vbasic.version.Version; -@objid ("1e9aed3f-df4d-4e3b-b6de-e76f6495f7d3") public class VariabilityDesignerPeerModule implements IVariabilityDesignerPeerModule { - @objid ("5cbc23bb-d124-4578-9d76-f87e80c29e3c") private VariabilityDesignerModule module = null; - @objid ("96e1f2d8-4e2f-4943-810f-1984b4c5a85b") private IModuleAPIConfiguration peerConfiguration; - @objid ("450a0cbe-83f6-46f7-b814-da700b000035") public VariabilityDesignerPeerModule(final VariabilityDesignerModule module, final IModuleAPIConfiguration peerConfiguration) { this.module = module; this.peerConfiguration = peerConfiguration; } - @objid ("38be1abe-262c-4521-872e-dc7fa56052ff") public IModuleAPIConfiguration getConfiguration() { return this.peerConfiguration; } - @objid ("ba9469f2-15cf-4447-b02e-40d4501f3daa") public String getDescription() { return this.module.getDescription(); } - @objid ("e3fc0d83-e269-4691-a64e-c0aa16c05e58") public String getName() { return this.module.getName(); } - @objid ("87de7565-7eda-4fef-991c-82fd5eed0fc7") public Version getVersion() { return this.module.getVersion(); } - @objid ("a4fe1468-2d40-4f4f-9969-d5c2d58c8b51") void init() { } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/DiagramToolsUtils.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/DiagramToolsUtils.java index bf99c1b..3d4564a 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/DiagramToolsUtils.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/DiagramToolsUtils.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.draw2d.geometry.Rectangle; import org.modelio.api.modelio.diagram.IDiagramGraphic; import org.modelio.api.modelio.diagram.IDiagramHandle; @@ -20,9 +19,7 @@ import org.modelio.metamodel.uml.infrastructure.UmlModelElement; import org.modelio.module.variabilitydesigner.api.IVariabilityDesignerPeerModule; -@objid ("57910e46-e3cc-4f34-b29e-9470232a40cc") public class DiagramToolsUtils { - @objid ("3827c23b-f16a-43f4-8768-c5a156d08641") public static boolean acceptElement(DefaultMultiLinkTool tool, final IDiagramHandle diagramHandle, final IDiagramGraphic targetNode) { ModelElement owner = null; @@ -33,14 +30,13 @@ public static boolean acceptElement(DefaultMultiLinkTool tool, final IDiagramHan } for (ElementScope aScope : tool.getSourceScopes()) { - if (aScope.isMatching(owner, true)) { + if (aScope.isMatching(owner)) { return true; } } return false; } - @objid ("5f8c45d6-3283-4bf0-9b0d-1b5b406f5d0f") public static void constraintCreation(DefaultMultiLinkTool tool, String stereotype, final IDiagramHandle diagramHandle, final IDiagramGraphic lastNode, final List otherNodes, final List routerKinds, final List paths, final Rectangle rectangle) { IModelingSession session = tool.getModule().getModuleContext().getModelingSession(); @@ -55,9 +51,9 @@ public static void constraintCreation(DefaultMultiLinkTool tool, String stereoty constraint.addStereotype(IVariabilityDesignerPeerModule.MODULE_NAME, stereotype); constraint.setName("variation"); constraint.getConstrainedElement().addAll(contrainedElements); - + int i = 0; - + List graph = diagramHandle.unmask(constraint, rectangle.x, rectangle.y); for (IDiagramGraphic iDiagramGraphic : graph) { if (iDiagramGraphic instanceof IDiagramLink) { diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/MObjectNameComparator.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/MObjectNameComparator.java index 5d24837..42620cb 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/MObjectNameComparator.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/MObjectNameComparator.java @@ -1,12 +1,9 @@ package org.modelio.module.variabilitydesigner.utils.specialcollections; import java.util.Comparator; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("0c743ada-3dbb-4ef3-959a-1335d19367ee") public class MObjectNameComparator implements Comparator { - @objid ("5062f907-a967-44a6-b828-b9143a8c217f") @Override public int compare(MObject o1, MObject o2) { int res = o1.getName().compareTo(o2.getName()); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/SpecialMap.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/SpecialMap.java index 7529f19..f4da3f7 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/SpecialMap.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/SpecialMap.java @@ -2,7 +2,6 @@ import java.util.Collection; import java.util.TreeMap; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.module.variabilitydesigner.vel.imports.MAttributeValue; import org.modelio.vcore.smkernel.mapi.MObject; @@ -11,9 +10,7 @@ * Matching MObject don't have to be exactly the same with same UUID but have to match condition specified in MObjectNameComparator * @author abeaufays */ -@objid ("e9c185ed-35b0-4d17-8b0b-fd4bd3748ef0") public class SpecialMap extends TreeMap> { - @objid ("f39a2b1d-5d3d-463d-8dfb-f5b584165b4c") public SpecialMap() { super(new MObjectNameComparator()); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/SpecialSet.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/SpecialSet.java index b5e2185..d188b8b 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/SpecialSet.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/specialcollections/SpecialSet.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.utils.specialcollections; import java.util.TreeSet; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.vcore.smkernel.mapi.MObject; /** @@ -9,9 +8,7 @@ * Matching MObject don't have to be exactly the same with same UUID but have to match condition specified in MObjectNameComparator * @author abeaufays */ -@objid ("73500699-8bd1-4d53-991d-719d3b78c338") public class SpecialSet extends TreeSet { - @objid ("f23c1893-b718-47fa-844a-5fdac62364b1") public SpecialSet() { super(new MObjectNameComparator()); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/CompositionUMLElement.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/CompositionUMLElement.java index d713dd8..8ae3d4c 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/CompositionUMLElement.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/CompositionUMLElement.java @@ -2,23 +2,18 @@ import java.util.ArrayList; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("5a59ac6c-7767-4454-a594-c6251469f838") public class CompositionUMLElement extends IUMLElement { - @objid ("35383b26-e9b7-4db3-a1b8-ab40d485becc") public CompositionUMLElement(MObject element) { super(element); } - @objid ("15b15fe4-a27a-4c87-92c1-f02f5d80dbb1") @Override public CompositionUMLElement getParent() { return new CompositionUMLElement(getElement().getCompositionOwner()); } - @objid ("07ee4428-a94a-480e-8523-a0009f5c5570") @Override public List getChildren() { List res = new ArrayList<>(); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/IUMLElement.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/IUMLElement.java index 991ab8e..74a3d8a 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/IUMLElement.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/IUMLElement.java @@ -1,20 +1,15 @@ package org.modelio.module.variabilitydesigner.utils.uml; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.module.variabilitydesigner.utils.walkers.IWalkable; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("5008aa46-c130-453f-aac4-2dd25140b599") public abstract class IUMLElement implements IWalkable { - @objid ("2ce546aa-0971-4818-adc4-3f53bbfcf182") private MObject _element; - @objid ("3f600da8-f6e3-48d8-bfbe-5af3f49badca") public IUMLElement(MObject element) { _element = element; } - @objid ("56031de6-edb0-4748-be23-5e4c4f0bc9a3") public MObject getElement() { return _element; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/UMLProcess.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/UMLProcess.java index 9ad4be7..93965a9 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/UMLProcess.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/uml/UMLProcess.java @@ -1,18 +1,14 @@ package org.modelio.module.variabilitydesigner.utils.uml; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.module.variabilitydesigner.utils.walkers.IProcess; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("9bc0b2cb-ccae-45f2-bc04-5f13a82ae10b") public abstract class UMLProcess implements IProcess { - @objid ("6798290c-d216-4848-a4cd-a2cfd16cb6ce") @Override public final void process(IUMLElement element) { process(element.getElement()); } - @objid ("84de187e-ab15-4e72-9975-82a6b0a24458") public abstract void process(MObject element); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/IProcess.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/IProcess.java index 4bc16f8..beb8244 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/IProcess.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/IProcess.java @@ -1,13 +1,9 @@ package org.modelio.module.variabilitydesigner.utils.walkers; -import com.modeliosoft.modelio.javadesigner.annotations.objid; -@objid ("c5d5bc64-6089-43a0-b32d-1be4f99a6205") public interface IProcess { - @objid ("73d136be-bc74-4ec8-85e5-6c5c3410a601") void process(T element); - @objid ("3cd14378-2375-417c-8c27-ffdc583cd381") default WalkingStrategy getWalkingStrategy() { return WalkingStrategy.DEPTH; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/IWalkable.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/IWalkable.java index 8ffe847..577ed35 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/IWalkable.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/IWalkable.java @@ -1,14 +1,10 @@ package org.modelio.module.variabilitydesigner.utils.walkers; import java.util.List; -import com.modeliosoft.modelio.javadesigner.annotations.objid; -@objid ("d98bda49-2d80-43cb-a58c-f766eefb4aa6") public interface IWalkable { - @objid ("10bf2011-a77e-4f3a-b61e-1df0c9edf58d") IWalkable getParent(); - @objid ("d202d41b-7131-497f-80c2-7de212f4ce0c") List getChildren(); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/Walker.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/Walker.java index 1feeec7..62709ab 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/Walker.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/Walker.java @@ -3,14 +3,10 @@ import java.util.Collection; import java.util.Deque; import java.util.LinkedList; -import com.modeliosoft.modelio.javadesigner.annotations.objid; -@objid ("2c898896-5418-40c9-832f-aa6b7d40a815") public class Walker { - @objid ("12dc7435-1ddf-4d94-88ff-2b198c8eb88b") private IProcess _process; - @objid ("b6ddf94a-dbbe-4b20-b92c-c09d413fa912") public void setProcess(IProcess process) { _process = process; } @@ -21,7 +17,6 @@ public void setProcess(IProcess process) { * * @param element Walkable element to explore */ - @objid ("8289ec1b-097f-494c-aa24-07e7419b5353") public void walk(T element) { WalkingStrategy way = _process.getWalkingStrategy(); switch (way) { @@ -43,7 +38,6 @@ public void walk(T element) { * * @param element Walkable element to explore */ - @objid ("8adbcce5-7066-40df-a176-c3fe7ba99fa8") @SuppressWarnings("unchecked") public void depthWalk(T element) { _process.process(element); @@ -57,7 +51,6 @@ public void depthWalk(T element) { * * @param element Walkable element to explore */ - @objid ("1b1436a4-bda1-4de0-9aa6-b66609c41b88") @SuppressWarnings("unchecked") public void breadthWalk(T element) { Deque queue = new LinkedList<>(); @@ -75,7 +68,6 @@ public void breadthWalk(T element) { * * @param element Walkable element to explore */ - @objid ("0d0be713-7e5f-43ae-8e0a-d9c927daa622") @SuppressWarnings("unchecked") public void reverseDepthWalk(T element) { for (IWalkable child : element.getChildren()) { diff --git a/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/WalkingStrategy.java b/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/WalkingStrategy.java index 9c95de1..9b8a448 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/WalkingStrategy.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/utils/walkers/WalkingStrategy.java @@ -1,8 +1,6 @@ package org.modelio.module.variabilitydesigner.utils.walkers; -import com.modeliosoft.modelio.javadesigner.annotations.objid; -@objid ("c95883c3-edc7-427a-9a6c-054b631f4737") public enum WalkingStrategy { DEPTH, BREADTH, diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ArtifactElementType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ArtifactElementType.java index 6bfbfe2..a474a87 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ArtifactElementType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ArtifactElementType.java @@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.w3c.dom.Element; /** @@ -31,23 +30,19 @@ * </complexType> * */ -@objid ("0433579f-4903-4a84-b3e9-2f09cb0bbcfe") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "artifact-element-type", propOrder = { "any" }) @XmlSeeAlso(Uuid.class) public class ArtifactElementType { - @objid ("df017e41-8461-4828-838e-fd6df7efd386") @XmlAttribute(name = "type") protected String type; - @objid ("27fe99bf-1fb7-4293-a7fc-1a76fe642c2f") @XmlAttribute(name = "uri") @XmlSchemaType(name = "anyURI") protected String uri; - @objid ("d9c4ee43-de44-44a6-aa39-145a1b809824") @XmlAnyElement(lax = true) protected List any; @@ -72,7 +67,6 @@ public class ArtifactElementType { * {@link Element } * {@link Object } */ - @objid ("64975bf2-22fe-40a7-b78b-b1b8d1967fae") public List getAny() { if (any == null) { any = new ArrayList(); @@ -86,7 +80,6 @@ public List getAny() { * possible object is * {@link String } */ - @objid ("80e1f0bd-165d-45e7-9021-09d017ef4aa6") public String getType() { return type; } @@ -97,7 +90,6 @@ public String getType() { * @param value allowed object is * {@link String } */ - @objid ("99e62484-a97f-4363-931e-6972265f840e") public void setType(String value) { this.type = value; } @@ -108,7 +100,6 @@ public void setType(String value) { * possible object is * {@link String } */ - @objid ("15162955-74df-42b4-839f-424a6c99a801") public String getUri() { return uri; } @@ -119,7 +110,6 @@ public String getUri() { * @param value allowed object is * {@link String } */ - @objid ("0ff79c71-8748-47c8-a860-5008e4f64c71") public void setUri(String value) { this.uri = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/BindingtimeEnum.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/BindingtimeEnum.java index 7afaf69..d1ee25b 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/BindingtimeEnum.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/BindingtimeEnum.java @@ -3,7 +3,6 @@ import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour bindingtime-enum. @@ -30,7 +29,6 @@ * </simpleType> * */ -@objid ("0f61f037-9227-484a-a707-5e852b0b9806") @XmlType(name = "bindingtime-enum") @XmlEnum public enum BindingtimeEnum { @@ -61,20 +59,16 @@ public enum BindingtimeEnum { @XmlEnumValue("run-time") RUN_TIME ("run-time"); - @objid ("45385430-e3b8-4cec-9b7d-e3197b30a8f1") private final String value; - @objid ("f7f36654-80bd-4d30-8e67-f2cd95b04029") BindingtimeEnum(String v) { value = v; } - @objid ("90f96884-2291-4ba8-800b-e7b770d45e10") public String value() { return value; } - @objid ("c3cefec6-7845-4a77-beb1-e6992012204d") public static BindingtimeEnum fromValue(String v) { for (BindingtimeEnum c: BindingtimeEnum.values()) { if (c.value.equals(v)) { diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/BindingtimeType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/BindingtimeType.java index 99df5b1..d666207 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/BindingtimeType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/BindingtimeType.java @@ -6,7 +6,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour bindingtime-type complex type. @@ -27,23 +26,19 @@ * </complexType> * */ -@objid ("dc34672d-9e6e-4760-8b04-0ef1c923f2d8") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "bindingtime-type", propOrder = { "name", "condition" }) public class BindingtimeType { - @objid ("7253588b-54c8-4e2d-b0a7-3cfb1b327f19") @XmlElement(required = true) @XmlSchemaType(name = "string") protected BindingtimeEnum name; - @objid ("acf0b4f1-d2eb-447f-ae6d-562f5d5c2267") @XmlAttribute(name = "selected") protected Boolean selected; - @objid ("ca7da9dc-9899-4ca2-92a4-69cdb88ee02e") protected ExpressionType condition; /** @@ -52,7 +47,6 @@ public class BindingtimeType { * possible object is * {@link BindingtimeEnum } */ - @objid ("7f3e5643-7f32-43fb-aea4-e556df8ab1b0") public BindingtimeEnum getName() { return name; } @@ -63,7 +57,6 @@ public BindingtimeEnum getName() { * @param value allowed object is * {@link BindingtimeEnum } */ - @objid ("f8c54b7f-94be-4728-b60d-09796d9ca913") public void setName(BindingtimeEnum value) { this.name = value; } @@ -74,7 +67,6 @@ public void setName(BindingtimeEnum value) { * possible object is * {@link ExpressionType } */ - @objid ("6de34714-20ab-4f55-ae61-dfafa2d74495") public ExpressionType getCondition() { return condition; } @@ -85,7 +77,6 @@ public ExpressionType getCondition() { * @param value allowed object is * {@link ExpressionType } */ - @objid ("4e071058-9fdb-453b-a006-390ce5a9e365") public void setCondition(ExpressionType value) { this.condition = value; } @@ -96,7 +87,6 @@ public void setCondition(ExpressionType value) { * possible object is * {@link Boolean } */ - @objid ("e05ec56e-2867-46ae-8775-39c806a2133e") public Boolean isSelected() { return selected; } @@ -107,7 +97,6 @@ public Boolean isSelected() { * @param value allowed object is * {@link Boolean } */ - @objid ("0c076dd4-be04-46af-9df8-19cb8743581b") public void setSelected(Boolean value) { this.selected = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CalculatedParameterVariationpointType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CalculatedParameterVariationpointType.java index d9fd025..418a32d 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CalculatedParameterVariationpointType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CalculatedParameterVariationpointType.java @@ -6,7 +6,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour calculated-parameter-variationpoint-type complex type. @@ -25,13 +24,11 @@ * </complexType> * */ -@objid ("fe696476-f9ef-4a2e-b883-5e12444301ff") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "calculated-parameter-variationpoint-type", propOrder = { "variation" }) public class CalculatedParameterVariationpointType extends VariationpointType { - @objid ("57b20eb2-3b30-40e2-9af7-afbd987a49d4") @XmlElement(required = true) protected CalculatedVariationType variation; @@ -41,7 +38,6 @@ public class CalculatedParameterVariationpointType extends VariationpointType { * possible object is * {@link CalculatedVariationType } */ - @objid ("223935b9-43d8-4302-8a3b-962c426dadce") public CalculatedVariationType getVariation() { return variation; } @@ -52,12 +48,10 @@ public CalculatedVariationType getVariation() { * @param value allowed object is * {@link CalculatedVariationType } */ - @objid ("0e6ccea1-77ad-4ac4-9648-9e630ac19874") public void setVariation(CalculatedVariationType value) { this.variation = value; } - @objid ("aba4a8ec-3282-4a29-ab1b-b9b0817897a0") @Override public List getVariations() { List res = new ArrayList<>(); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CalculatedVariationType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CalculatedVariationType.java index 73d4bb1..c8ac23d 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CalculatedVariationType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CalculatedVariationType.java @@ -3,7 +3,6 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour calculated-variation-type complex type. @@ -22,13 +21,11 @@ * </complexType> * */ -@objid ("8b8c001b-54a8-4d5d-93e2-7cc5c7b9a048") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "calculated-variation-type", propOrder = { "expression" }) public class CalculatedVariationType extends VariationType { - @objid ("f73f3d79-3a82-4a44-822a-84bbe2234c93") protected ExpressionType expression; /** @@ -37,7 +34,6 @@ public class CalculatedVariationType extends VariationType { * possible object is * {@link ExpressionType } */ - @objid ("be92c450-c123-4eb7-b481-d1a89f14b752") public ExpressionType getExpression() { return expression; } @@ -48,7 +44,6 @@ public ExpressionType getExpression() { * @param value allowed object is * {@link ExpressionType } */ - @objid ("70c05e52-ffdc-4ca9-a65b-096f9de56d29") public void setExpression(ExpressionType value) { this.expression = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CapabilityType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CapabilityType.java index 175c29f..4c8fcca 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CapabilityType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/CapabilityType.java @@ -4,7 +4,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour capability-type complex type. @@ -26,7 +25,6 @@ * </complexType> * */ -@objid ("43a913fc-caca-4d58-977e-a76ee77d14d9") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "capability-type", propOrder = { "importVariabilityExchangeModel", @@ -35,26 +33,21 @@ "setConfiguration" }) public class CapabilityType { - @objid ("527e4089-adf8-4c9c-9f75-87197f21afb1") @XmlElement(name = "import-variability-exchange-model") protected boolean importVariabilityExchangeModel; - @objid ("2106cc51-ea54-4b71-b306-ad358250dfc9") @XmlElement(name = "export-variability-exchange-model") protected boolean exportVariabilityExchangeModel; - @objid ("2fcf4bb2-e01a-42db-a9ec-120b702545c8") @XmlElement(name = "get-configuration") protected boolean getConfiguration; - @objid ("b05c61c9-4957-4946-80d3-b645eedc07a9") @XmlElement(name = "set-configuration") protected boolean setConfiguration; /** * Obtient la valeur de la propri�t� importVariabilityExchangeModel. */ - @objid ("a0324094-e76e-49ca-8a2e-23ceba17def2") public boolean isImportVariabilityExchangeModel() { return importVariabilityExchangeModel; } @@ -62,7 +55,6 @@ public boolean isImportVariabilityExchangeModel() { /** * D�finit la valeur de la propri�t� importVariabilityExchangeModel. */ - @objid ("21ccaa77-6c06-4c7e-86ce-75f61835f509") public void setImportVariabilityExchangeModel(boolean value) { this.importVariabilityExchangeModel = value; } @@ -70,7 +62,6 @@ public void setImportVariabilityExchangeModel(boolean value) { /** * Obtient la valeur de la propri�t� exportVariabilityExchangeModel. */ - @objid ("08c065d3-8d67-497a-90fa-ec7481218e00") public boolean isExportVariabilityExchangeModel() { return exportVariabilityExchangeModel; } @@ -78,7 +69,6 @@ public boolean isExportVariabilityExchangeModel() { /** * D�finit la valeur de la propri�t� exportVariabilityExchangeModel. */ - @objid ("27d2154d-760e-404d-97b9-ea1dbe826eba") public void setExportVariabilityExchangeModel(boolean value) { this.exportVariabilityExchangeModel = value; } @@ -86,7 +76,6 @@ public void setExportVariabilityExchangeModel(boolean value) { /** * Obtient la valeur de la propri�t� getConfiguration. */ - @objid ("3bc2ffb6-ca5f-430e-a94e-e38ca4aca5d6") public boolean isGetConfiguration() { return getConfiguration; } @@ -94,7 +83,6 @@ public boolean isGetConfiguration() { /** * D�finit la valeur de la propri�t� getConfiguration. */ - @objid ("23a81275-0d33-4b28-ab04-42958f9881b3") public void setGetConfiguration(boolean value) { this.getConfiguration = value; } @@ -102,7 +90,6 @@ public void setGetConfiguration(boolean value) { /** * Obtient la valeur de la propri�t� setConfiguration. */ - @objid ("975bdf51-01a7-4bb5-8df7-a99d5f6c736d") public boolean isSetConfiguration() { return setConfiguration; } @@ -110,7 +97,6 @@ public boolean isSetConfiguration() { /** * D�finit la valeur de la propri�t� setConfiguration. */ - @objid ("a7cab7c4-b3e2-4000-a312-24a8cf8817d5") public void setSetConfiguration(boolean value) { this.setConfiguration = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ExpressionEnum.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ExpressionEnum.java index 655b780..1a27824 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ExpressionEnum.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ExpressionEnum.java @@ -3,7 +3,6 @@ import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour expression-enum. @@ -23,7 +22,6 @@ * </simpleType> * */ -@objid ("fab088cd-f1e2-495b-bfba-0246df4435fe") @XmlType(name = "expression-enum") @XmlEnum public enum ExpressionEnum { @@ -40,20 +38,16 @@ public enum ExpressionEnum { @XmlEnumValue("autosar-expression") AUTOSAR_EXPRESSION ("autosar-expression"); - @objid ("a73dee1a-3042-4577-848d-f1079837502d") private final String value; - @objid ("5e34177d-671a-4ad9-90a3-1ea46790693a") ExpressionEnum(String v) { value = v; } - @objid ("efd65202-1967-4823-b586-0b1f411d1c42") public String value() { return value; } - @objid ("02245074-4b65-48ea-bc10-7078d3e072fb") public static ExpressionEnum fromValue(String v) { for (ExpressionEnum c: ExpressionEnum.values()) { if (c.value.equals(v)) { diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ExpressionType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ExpressionType.java index b4a2d90..14c539c 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ExpressionType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ExpressionType.java @@ -5,7 +5,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour expression-type complex type. @@ -23,21 +22,17 @@ * </complexType> * */ -@objid ("44811609-e0bc-4f63-be99-c7a3599fe1f1") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "expression-type", propOrder = { "value" }) public class ExpressionType { - @objid ("0def4f65-9e0d-4e04-9736-a65a9e47408f") @XmlValue protected String value; - @objid ("f67528f9-dfa0-44d6-b819-a80abc9bfd56") @XmlAttribute(name = "type", required = true) protected ExpressionEnum type; - @objid ("1c810731-9c87-4528-bfd7-e40cab304a53") @XmlAttribute(name = "datatype") protected String datatype; @@ -47,7 +42,6 @@ public class ExpressionType { * possible object is * {@link String } */ - @objid ("09948cc9-3107-432c-8730-5b7886a8f341") public String getValue() { return value; } @@ -58,7 +52,6 @@ public String getValue() { * @param value allowed object is * {@link String } */ - @objid ("8691019f-0f89-4e84-b545-aed00bd05ec4") public void setValue(String value) { this.value = value; } @@ -69,7 +62,6 @@ public void setValue(String value) { * possible object is * {@link ExpressionEnum } */ - @objid ("76d894de-e4ac-44a0-b571-8ea558823908") public ExpressionEnum getType() { return type; } @@ -80,7 +72,6 @@ public ExpressionEnum getType() { * @param value allowed object is * {@link ExpressionEnum } */ - @objid ("a6a262d4-eaef-4cc3-99da-32ea407b0f6b") public void setType(ExpressionEnum value) { this.type = value; } @@ -91,7 +82,6 @@ public void setType(ExpressionEnum value) { * possible object is * {@link String } */ - @objid ("eeb553ea-edf0-425a-9c1c-ceacd45b7e9f") public String getDatatype() { return datatype; } @@ -102,7 +92,6 @@ public String getDatatype() { * @param value allowed object is * {@link String } */ - @objid ("a69a5479-27af-44a5-b36b-caca32e36ee9") public void setDatatype(String value) { this.datatype = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/IdentifiableType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/IdentifiableType.java index 2daa781..ba7b3f0 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/IdentifiableType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/IdentifiableType.java @@ -12,7 +12,6 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour identifiable-type complex type. @@ -39,7 +38,6 @@ * </complexType> * */ -@objid ("e08df8b4-15d9-461b-8850-0ec36719f9b5") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "identifiable-type", propOrder = { "specialData" @@ -53,18 +51,15 @@ VariationType.class }) public abstract class IdentifiableType { - @objid ("bca5151c-4103-4c7f-8bad-68034b4ab09c") @XmlAttribute(name = "name") protected String name; - @objid ("68912e75-32b5-42a8-91c6-afc9c794ebbf") @XmlAttribute(name = "id", required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) @XmlID @XmlSchemaType(name = "ID") protected String id; - @objid ("3083152a-d75c-44f2-bb8c-273db1ad2146") @XmlElement(name = "special-data") protected List specialData; @@ -88,7 +83,6 @@ public abstract class IdentifiableType { * Objects of the following type(s) are allowed in the list * {@link SpecialDataType } */ - @objid ("60e72573-1fb7-4b01-acbc-08e94586aa29") public List getSpecialData() { if (specialData == null) { specialData = new ArrayList(); @@ -102,7 +96,6 @@ public List getSpecialData() { * possible object is * {@link String } */ - @objid ("a576ea3a-3879-46ec-8933-4f6f809ec7df") public String getName() { return name; } @@ -113,7 +106,6 @@ public String getName() { * @param value allowed object is * {@link String } */ - @objid ("cbdf0895-e09f-4224-b518-03f20d5a9fbb") public void setName(String value) { this.name = value; } @@ -124,7 +116,6 @@ public void setName(String value) { * possible object is * {@link String } */ - @objid ("b6695dfe-da29-48bb-9bf3-d09748f4e260") public String getId() { return id; } @@ -135,7 +126,6 @@ public String getId() { * @param value allowed object is * {@link String } */ - @objid ("64e31cc0-c515-46d6-87c0-fcae7b7dec8c") public void setId(String value) { this.id = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/KeyValuePairType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/KeyValuePairType.java index 2bb2219..d6e2b66 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/KeyValuePairType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/KeyValuePairType.java @@ -6,7 +6,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour key-value-pair-type complex type. @@ -40,18 +39,15 @@ * </complexType> * */ -@objid ("7fb73817-255f-4b24-9297-2c880afb4b2c") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "key-value-pair-type", propOrder = { "key", "value" }) public class KeyValuePairType { - @objid ("96e86e4d-a057-442c-bd1c-fbd29049dde3") @XmlElement(required = true) protected String key; - @objid ("e77d39e5-218c-4287-87dd-807527198de1") @XmlElement(required = true) protected org.modelio.module.variabilitydesigner.variabilitymodel.KeyValuePairType.Value value; @@ -61,7 +57,6 @@ public class KeyValuePairType { * possible object is * {@link String } */ - @objid ("f26c5765-ecfb-4f45-af2f-3866ca568f97") public String getKey() { return key; } @@ -72,7 +67,6 @@ public String getKey() { * @param value allowed object is * {@link String } */ - @objid ("11a22681-0a62-428c-84be-b7ebc174b1c5") public void setKey(String value) { this.key = value; } @@ -83,7 +77,6 @@ public void setKey(String value) { * possible object is * {@link KeyValuePairType.Value } */ - @objid ("0a3f60e8-9dc0-4554-9697-49a5ebd9372d") public org.modelio.module.variabilitydesigner.variabilitymodel.KeyValuePairType.Value getValue() { return value; } @@ -94,7 +87,6 @@ public org.modelio.module.variabilitydesigner.variabilitymodel.KeyValuePairType. * @param value allowed object is * {@link KeyValuePairType.Value } */ - @objid ("b1103917-81be-4785-8a87-8c84fcaaa778") public void setValue(org.modelio.module.variabilitydesigner.variabilitymodel.KeyValuePairType.Value value) { this.value = value; } @@ -114,17 +106,14 @@ public void setValue(org.modelio.module.variabilitydesigner.variabilitymodel.Key * </complexType> * */ - @objid ("78b31c07-cdb2-4cf1-9f07-ee0a7e48f03b") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { "value" }) public static class Value { - @objid ("1ca70834-659d-4f85-b3ba-138e349fb6f1") @XmlValue protected String value; - @objid ("6a2a66b3-efee-4e44-9f99-4728d4b1efaf") @XmlAttribute(name = "type") protected String type; @@ -134,7 +123,6 @@ public static class Value { * possible object is * {@link String } */ - @objid ("936fc071-aa4e-4cdd-af21-1b0e383d7c78") public String getValue() { return value; } @@ -145,7 +133,6 @@ public String getValue() { * @param value allowed object is * {@link String } */ - @objid ("8225e4fc-7742-4a2a-b1c7-c72754499861") public void setValue(String value) { this.value = value; } @@ -156,7 +143,6 @@ public void setValue(String value) { * possible object is * {@link String } */ - @objid ("529cc763-e3fa-4410-8f30-a79d52aaa3c5") public String getType() { return type; } @@ -167,7 +153,6 @@ public String getType() { * @param value allowed object is * {@link String } */ - @objid ("790e039a-7fd2-42a5-98a7-6a767e0d05f4") public void setType(String value) { this.type = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ObjectFactory.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ObjectFactory.java index 1d2a477..7254b05 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ObjectFactory.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ObjectFactory.java @@ -4,7 +4,6 @@ import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** * This object contains factory methods for each @@ -19,23 +18,19 @@ * groups. Factory methods for each of these are * provided in this class. */ -@objid ("9c95b446-dfe3-48ca-80e3-19e56fd92179") @XmlRegistry public class ObjectFactory { - @objid ("762257ad-f156-4214-9c67-d746580df9f5") private static final QName _VariabilityExchangeModels_QNAME = new QName("", "variability-exchange-models"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: generated */ - @objid ("2830130c-d0d4-4d47-b08b-ab66c100b60b") public ObjectFactory() { } /** * Create an instance of {@link KeyValuePairType } */ - @objid ("37e57ca3-51a1-40a3-b4e4-a70c84e483b6") public KeyValuePairType createKeyValuePairType() { return new KeyValuePairType(); } @@ -43,7 +38,6 @@ public KeyValuePairType createKeyValuePairType() { /** * Create an instance of {@link VariationDependencyType } */ - @objid ("68bbc411-ef05-4d25-85ce-b0f213de9079") public VariationDependencyType createVariationDependencyType() { return new VariationDependencyType(); } @@ -51,7 +45,6 @@ public VariationDependencyType createVariationDependencyType() { /** * Create an instance of {@link VariationpointHierarchyType } */ - @objid ("5340694f-fb26-4804-b10b-cf473d6235b4") public VariationpointHierarchyType createVariationpointHierarchyType() { return new VariationpointHierarchyType(); } @@ -59,7 +52,6 @@ public VariationpointHierarchyType createVariationpointHierarchyType() { /** * Create an instance of {@link VariabilityExchangeModelsType } */ - @objid ("33e01868-4571-441d-a5ef-945735a1e9d2") public VariabilityExchangeModelsType createVariabilityExchangeModelsType() { return new VariabilityExchangeModelsType(); } @@ -67,7 +59,6 @@ public VariabilityExchangeModelsType createVariabilityExchangeModelsType() { /** * Create an instance of {@link XorParameterVariationpointType } */ - @objid ("bd7d02b8-7b8d-4b4a-8201-5e3b97d2ae70") public XorParameterVariationpointType createXorParameterVariationpointType() { return new XorParameterVariationpointType(); } @@ -75,7 +66,6 @@ public XorParameterVariationpointType createXorParameterVariationpointType() { /** * Create an instance of {@link ExpressionType } */ - @objid ("b36cdd1b-6188-4bd2-90ab-352e25359bf7") public ExpressionType createExpressionType() { return new ExpressionType(); } @@ -83,7 +73,6 @@ public ExpressionType createExpressionType() { /** * Create an instance of {@link CalculatedParameterVariationpointType } */ - @objid ("4a857930-97c9-4d57-8c7a-9b9ce5b4a875") public CalculatedParameterVariationpointType createCalculatedParameterVariationpointType() { return new CalculatedParameterVariationpointType(); } @@ -91,7 +80,6 @@ public CalculatedParameterVariationpointType createCalculatedParameterVariationp /** * Create an instance of {@link VariabilityExchangeModelType } */ - @objid ("279e9ab4-2163-4516-9ff0-607e32fccd7a") public VariabilityExchangeModelType createVariabilityExchangeModelType() { return new VariabilityExchangeModelType(); } @@ -99,7 +87,6 @@ public VariabilityExchangeModelType createVariabilityExchangeModelType() { /** * Create an instance of {@link SpecialDataType } */ - @objid ("9882f204-45f9-40b7-87cd-055a443bc43a") public SpecialDataType createSpecialDataType() { return new SpecialDataType(); } @@ -107,7 +94,6 @@ public SpecialDataType createSpecialDataType() { /** * Create an instance of {@link XorVariationType } */ - @objid ("e531a565-6b5d-4a19-9377-724a1765de34") public XorVariationType createXorVariationType() { return new XorVariationType(); } @@ -115,7 +101,6 @@ public XorVariationType createXorVariationType() { /** * Create an instance of {@link OptionalStructuralVariationpointType } */ - @objid ("f53a1932-7b53-4ab2-9d07-2b17590a58aa") public OptionalStructuralVariationpointType createOptionalStructuralVariationpointType() { return new OptionalStructuralVariationpointType(); } @@ -123,7 +108,6 @@ public OptionalStructuralVariationpointType createOptionalStructuralVariationpoi /** * Create an instance of {@link CalculatedVariationType } */ - @objid ("a48e792f-a6af-445f-bcbf-83fabeb3911b") public CalculatedVariationType createCalculatedVariationType() { return new CalculatedVariationType(); } @@ -131,7 +115,6 @@ public CalculatedVariationType createCalculatedVariationType() { /** * Create an instance of {@link CapabilityType } */ - @objid ("b9f071f9-878e-42a1-a665-085183c0c5df") public CapabilityType createCapabilityType() { return new CapabilityType(); } @@ -139,7 +122,6 @@ public CapabilityType createCapabilityType() { /** * Create an instance of {@link XorStructuralVariationpointType } */ - @objid ("04fa22dc-766e-4ad4-914d-dbc9bf9e6da4") public XorStructuralVariationpointType createXorStructuralVariationpointType() { return new XorStructuralVariationpointType(); } @@ -147,7 +129,6 @@ public XorStructuralVariationpointType createXorStructuralVariationpointType() { /** * Create an instance of {@link OptionalVariationType } */ - @objid ("d7b9c031-0e25-41bc-b04d-e788064c041b") public OptionalVariationType createOptionalVariationType() { return new OptionalVariationType(); } @@ -155,7 +136,6 @@ public OptionalVariationType createOptionalVariationType() { /** * Create an instance of {@link BindingtimeType } */ - @objid ("fe349f15-63a7-4d3f-bcb3-5988562cb0fa") public BindingtimeType createBindingtimeType() { return new BindingtimeType(); } @@ -163,7 +143,6 @@ public BindingtimeType createBindingtimeType() { /** * Create an instance of {@link ValueVariationType } */ - @objid ("b6b1e4ae-35b7-4fcc-9332-25f72c68773c") public ValueVariationType createValueVariationType() { return new ValueVariationType(); } @@ -171,7 +150,6 @@ public ValueVariationType createValueVariationType() { /** * Create an instance of {@link ArtifactElementType } */ - @objid ("90872e42-8323-42ec-8a89-419232fff788") public ArtifactElementType createArtifactElementType() { return new ArtifactElementType(); } @@ -179,7 +157,6 @@ public ArtifactElementType createArtifactElementType() { /** * Create an instance of {@link KeyValuePairType.Value } */ - @objid ("a7e5f859-5185-4d84-84ea-d762c7fdcee8") public org.modelio.module.variabilitydesigner.variabilitymodel.KeyValuePairType.Value createKeyValuePairTypeValue() { return new KeyValuePairType.Value(); } @@ -187,7 +164,6 @@ public org.modelio.module.variabilitydesigner.variabilitymodel.KeyValuePairType. /** * Create an instance of {@link VariationDependencyType.Variation } */ - @objid ("160ee725-f128-4857-b147-b2f2034632b3") public org.modelio.module.variabilitydesigner.variabilitymodel.VariationDependencyType.Variation createVariationDependencyTypeVariation() { return new VariationDependencyType.Variation(); } @@ -195,7 +171,6 @@ public org.modelio.module.variabilitydesigner.variabilitymodel.VariationDependen /** * Create an instance of {@link VariationpointHierarchyType.Variationpoint } */ - @objid ("6e68e2c9-5c35-41bf-9766-aed709d06f39") public org.modelio.module.variabilitydesigner.variabilitymodel.VariationpointHierarchyType.Variationpoint createVariationpointHierarchyTypeVariationpoint() { return new VariationpointHierarchyType.Variationpoint(); } @@ -203,7 +178,6 @@ public org.modelio.module.variabilitydesigner.variabilitymodel.VariationpointHie /** * Create an instance of {@link JAXBElement }{@code <}{@link VariabilityExchangeModelsType }{@code >}} */ - @objid ("472c5f0d-de0a-4d7c-87af-5d8bb853c7de") @XmlElementDecl(namespace = "", name = "variability-exchange-models") public JAXBElement createVariabilityExchangeModels(VariabilityExchangeModelsType value) { return new JAXBElement(_VariabilityExchangeModels_QNAME, VariabilityExchangeModelsType.class, null, value); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/OptionalStructuralVariationpointType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/OptionalStructuralVariationpointType.java index 6accd18..abe5a06 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/OptionalStructuralVariationpointType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/OptionalStructuralVariationpointType.java @@ -6,7 +6,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour optional-structural-variationpoint-type complex type. @@ -25,13 +24,11 @@ * </complexType> * */ -@objid ("eb4aaa68-36fb-4c5b-b9a8-9352371ead59") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "optional-structural-variationpoint-type", propOrder = { "variation" }) public class OptionalStructuralVariationpointType extends VariationpointType { - @objid ("3cd8b00d-7ee6-4af9-baa2-866cf8466269") @XmlElement(required = true) protected List variation; @@ -55,7 +52,6 @@ public class OptionalStructuralVariationpointType extends VariationpointType { * Objects of the following type(s) are allowed in the list * {@link OptionalVariationType } */ - @objid ("46362f14-28ef-4728-8e40-f4e494e8497a") public List getVariation() { if (variation == null) { variation = new ArrayList(); @@ -63,7 +59,6 @@ public List getVariation() { return this.variation; } - @objid ("a085afa5-4048-456a-82e9-2e4dbc5061ec") @Override public List getVariations() { return new ArrayList(getVariation()); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/OptionalVariationType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/OptionalVariationType.java index 53dd906..86cb3cf 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/OptionalVariationType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/OptionalVariationType.java @@ -3,7 +3,6 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour optional-variation-type complex type. @@ -22,13 +21,11 @@ * </complexType> * */ -@objid ("bbcb7420-558e-4669-b2e3-a73792f4d97e") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "optional-variation-type", propOrder = { "condition" }) public class OptionalVariationType extends VariationType { - @objid ("f187e83d-e25f-4fe8-a263-ec4d0af919e5") protected ExpressionType condition; /** @@ -37,7 +34,6 @@ public class OptionalVariationType extends VariationType { * possible object is * {@link ExpressionType } */ - @objid ("c45df4e4-b367-4a3d-bc39-c54f39ba6115") public ExpressionType getCondition() { return condition; } @@ -48,7 +44,6 @@ public ExpressionType getCondition() { * @param value allowed object is * {@link ExpressionType } */ - @objid ("36d3af69-583e-4cd0-a1c8-05bb75c4fbd4") public void setCondition(ExpressionType value) { this.condition = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/SpecialDataType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/SpecialDataType.java index ad5d3b7..0c4e846 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/SpecialDataType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/SpecialDataType.java @@ -6,7 +6,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour special-data-type complex type. @@ -26,17 +25,14 @@ * </complexType> * */ -@objid ("ec6902d3-a157-4e07-ad2a-2563684e97df") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "special-data-type", propOrder = { "data" }) public class SpecialDataType { - @objid ("77d1cd13-4001-4b57-a153-d9e1885d373e") @XmlAttribute(name = "name") protected String name; - @objid ("f627fea2-0666-47ed-9859-93f6f4ebfa3c") protected List data; /** @@ -59,7 +55,6 @@ public class SpecialDataType { * Objects of the following type(s) are allowed in the list * {@link KeyValuePairType } */ - @objid ("90d831d5-a5e3-4a26-a5b3-e3b85800eda9") public List getData() { if (data == null) { data = new ArrayList(); @@ -73,7 +68,6 @@ public List getData() { * possible object is * {@link String } */ - @objid ("7e1eb522-8bbc-4702-83d9-6c9b6b02bedc") public String getName() { return name; } @@ -84,7 +78,6 @@ public String getName() { * @param value allowed object is * {@link String } */ - @objid ("0eabb0d3-b8a1-47e2-84d4-a0330f4dc902") public void setName(String value) { this.name = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/Uuid.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/Uuid.java index 1623a56..3b93c2c 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/Uuid.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/Uuid.java @@ -5,47 +5,37 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; -import com.modeliosoft.modelio.javadesigner.annotations.objid; -@objid ("5f1b0c8f-bb73-40a5-91c5-db4d477223fa") @XmlAccessorType(XmlAccessType.FIELD) @XmlRootElement(name="uuid") public class Uuid { - @objid ("aa4bbbd1-65e7-4043-b6c5-10c1dfb9310e") @XmlValue private String value; - @objid ("84f71414-cd1f-4291-94b4-e352dd4fa6c1") @XmlAttribute private String mAttribute; - @objid ("15b98811-b20e-47ff-9a41-3501d105792b") public Uuid() { super(); } - @objid ("50a0074c-8a4c-49e5-824c-98d430dc6dc8") public Uuid(String value) { super(); this.value = value; } - @objid ("6f9a62d9-56b3-4038-a069-d2eba5105df9") public String getValue() { return value; } - @objid ("8336cad4-4921-4c67-91af-5e05fbe316ca") public void setValue(String value) { this.value = value; } - @objid ("1b4ba1e9-d8ec-4ec6-9681-4b0ffacc3c36") public String getMAttribute() { return mAttribute; } - @objid ("1d4c89d7-8e12-4c7e-9fc7-e908987708ff") public void setMAttribute(String value) { mAttribute = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ValueVariationType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ValueVariationType.java index 815d7ea..83ccded 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ValueVariationType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/ValueVariationType.java @@ -4,7 +4,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour value-variation-type complex type. @@ -24,18 +23,15 @@ * </complexType> * */ -@objid ("46762043-df72-4414-beaa-10cf6dfef2e0") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "value-variation-type", propOrder = { "condition", "value" }) public class ValueVariationType extends VariationType { - @objid ("cacc1057-657e-4f48-b495-75913f73a843") @XmlElement(required = true) protected String value; - @objid ("accc82db-4bfc-45a5-a4d6-21e1de8f68d9") protected ExpressionType condition; /** @@ -44,7 +40,6 @@ public class ValueVariationType extends VariationType { * possible object is * {@link ExpressionType } */ - @objid ("d3fbd768-3b6f-45f7-b790-aebd99231d97") public ExpressionType getCondition() { return condition; } @@ -55,7 +50,6 @@ public ExpressionType getCondition() { * @param value allowed object is * {@link ExpressionType } */ - @objid ("3f837d8f-98d8-44a2-b3ef-7ee72d95e4a6") public void setCondition(ExpressionType value) { this.condition = value; } @@ -66,7 +60,6 @@ public void setCondition(ExpressionType value) { * possible object is * {@link String } */ - @objid ("3bd29404-fd53-4906-b410-431bd8624822") public String getValue() { return value; } @@ -77,7 +70,6 @@ public String getValue() { * @param value allowed object is * {@link String } */ - @objid ("9c27bd31-af29-4312-98e0-94270a795c75") public void setValue(String value) { this.value = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityApiEnum.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityApiEnum.java index 4d3c386..572afa1 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityApiEnum.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityApiEnum.java @@ -3,7 +3,6 @@ import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour variability-api-enum. @@ -19,7 +18,6 @@ * </simpleType> * */ -@objid ("4ac36e77-56c4-4b23-b146-0680a6857ca9") @XmlType(name = "variability-api-enum") @XmlEnum public enum VariabilityApiEnum { @@ -28,20 +26,16 @@ public enum VariabilityApiEnum { @XmlEnumValue("variationpoint-configuration") VARIATIONPOINT_CONFIGURATION ("variationpoint-configuration"); - @objid ("e567c46c-b301-4473-90b6-9fc9df433bab") private final String value; - @objid ("4a1e4a44-1364-4c56-8ab1-b2c64fc4ceb2") VariabilityApiEnum(String v) { value = v; } - @objid ("dcf47be6-d0af-46a9-838b-03ab4438c338") public String value() { return value; } - @objid ("bababa87-f750-48a6-9819-10fb73dca6f9") public static VariabilityApiEnum fromValue(String v) { for (VariabilityApiEnum c: VariabilityApiEnum.values()) { if (c.value.equals(v)) { diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityExchangeModelType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityExchangeModelType.java index c041f25..3473ecf 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityExchangeModelType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityExchangeModelType.java @@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour variability-exchange-model-type complex type. @@ -30,22 +29,18 @@ * </complexType> * */ -@objid ("c4fbf428-32d3-4efd-a088-9f6ffae2b06e") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "variability-exchange-model-type", propOrder = { "variationpointGroup" }) public class VariabilityExchangeModelType extends IdentifiableType { - @objid ("2dd943b6-8b8c-470f-8315-dc9f09ace5a9") @XmlAttribute(name = "type", required = true) protected VariabilityApiEnum type; - @objid ("2bc15e7b-09f1-436a-a8e2-402ccaa88a02") @XmlAttribute(name = "uri") @XmlSchemaType(name = "anyURI") protected String uri; - @objid ("e5bb9aea-3507-4b78-94e0-d76b130ccbee") @XmlElements({ @XmlElement(name = "optional-structural-variationpoint", type = OptionalStructuralVariationpointType.class), @XmlElement(name = "xor-structural-variationpoint", type = XorStructuralVariationpointType.class), @@ -77,7 +72,6 @@ public class VariabilityExchangeModelType extends IdentifiableType { * {@link CalculatedParameterVariationpointType } * {@link XorParameterVariationpointType } */ - @objid ("17830f99-cba4-4c99-ace0-4552433b0642") public List getVariationpointGroup() { if (variationpointGroup == null) { variationpointGroup = new ArrayList(); @@ -91,7 +85,6 @@ public List getVariationpointGroup() { * possible object is * {@link VariabilityApiEnum } */ - @objid ("c56b1d99-b9e4-41a8-a7ba-af7cafb44a4f") public VariabilityApiEnum getType() { return type; } @@ -102,7 +95,6 @@ public VariabilityApiEnum getType() { * @param value allowed object is * {@link VariabilityApiEnum } */ - @objid ("4f50478d-8b9f-415f-bc9b-3acaa5f5bfd7") public void setType(VariabilityApiEnum value) { this.type = value; } @@ -113,7 +105,6 @@ public void setType(VariabilityApiEnum value) { * possible object is * {@link String } */ - @objid ("7153e3af-7657-4962-8758-3b2560d573bc") public String getUri() { return uri; } @@ -124,7 +115,6 @@ public String getUri() { * @param value allowed object is * {@link String } */ - @objid ("b6c138c1-854d-49d1-93b8-2ef97365f09c") public void setUri(String value) { this.uri = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityExchangeModelsType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityExchangeModelsType.java index 0f783e1..bc76014 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityExchangeModelsType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariabilityExchangeModelsType.java @@ -7,7 +7,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour variability-exchange-models-type complex type. @@ -28,7 +27,6 @@ * </complexType> * */ -@objid ("50525815-b8be-400b-a51d-0640f2f8c233") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "variability-exchange-models-type", propOrder = { "version", @@ -36,22 +34,18 @@ "variabilityExchangeModel" }) public class VariabilityExchangeModelsType extends IdentifiableType { - @objid ("15844cb3-7624-4d54-bfe1-8f5be2f13632") @XmlSchemaType(name = "unsignedInt") protected long version; - @objid ("89bdb914-8eda-4358-83fb-0a01e4f35749") @XmlElement(required = true) protected CapabilityType capability; - @objid ("823d707e-b16e-41a7-a5dd-5d6f4458c756") @XmlElement(name = "variability-exchange-model") protected List variabilityExchangeModel; /** * Obtient la valeur de la propri�t� version. */ - @objid ("246d1cba-127b-45f7-af7f-8dfab101a2d0") public long getVersion() { return version; } @@ -59,7 +53,6 @@ public long getVersion() { /** * D�finit la valeur de la propri�t� version. */ - @objid ("42f75fa2-61c1-4006-8d68-daba0ecd2933") public void setVersion(long value) { this.version = value; } @@ -70,7 +63,6 @@ public void setVersion(long value) { * possible object is * {@link CapabilityType } */ - @objid ("e0929095-02c3-44ff-9837-f00b0e0f5b00") public CapabilityType getCapability() { return capability; } @@ -81,7 +73,6 @@ public CapabilityType getCapability() { * @param value allowed object is * {@link CapabilityType } */ - @objid ("32d41d33-a6c2-488e-b026-615e4b6929c6") public void setCapability(CapabilityType value) { this.capability = value; } @@ -106,7 +97,6 @@ public void setCapability(CapabilityType value) { * Objects of the following type(s) are allowed in the list * {@link VariabilityExchangeModelType } */ - @objid ("93b63e47-0fc0-4cf7-96f6-9fe7dcbf02bc") public List getVariabilityExchangeModel() { if (variabilityExchangeModel == null) { variabilityExchangeModel = new ArrayList(); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationDependencyEnum.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationDependencyEnum.java index d01a544..fa3a5dd 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationDependencyEnum.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationDependencyEnum.java @@ -3,7 +3,6 @@ import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour variation-dependency-enum. @@ -19,7 +18,6 @@ * </simpleType> * */ -@objid ("1228aec2-a4be-4f2e-9193-6ed8c24b215e") @XmlType(name = "variation-dependency-enum") @XmlEnum public enum VariationDependencyEnum { @@ -28,20 +26,16 @@ public enum VariationDependencyEnum { @XmlEnumValue("conflicts") CONFLICTS ("conflicts"); - @objid ("0f5ac462-b00f-49fb-a6bb-fd914e711b28") private final String value; - @objid ("41fc469b-c83c-4867-bff1-476d14b41d76") VariationDependencyEnum(String v) { value = v; } - @objid ("35805de4-1470-42b7-801d-ee502796bbc9") public String value() { return value; } - @objid ("35b5e6df-e718-4958-922f-65eaa5a18ff7") public static VariationDependencyEnum fromValue(String v) { for (VariationDependencyEnum c: VariationDependencyEnum.values()) { if (c.value.equals(v)) { diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationDependencyType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationDependencyType.java index 604f1dc..7989c2e 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationDependencyType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationDependencyType.java @@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlIDREF; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour variation-dependency-type complex type. @@ -38,22 +37,18 @@ * </complexType> * */ -@objid ("0823b222-9f81-480f-b902-509a2966d43a") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "variation-dependency-type", propOrder = { "variation", "condition" }) public class VariationDependencyType extends IdentifiableType { - @objid ("253e6380-521c-4ffc-a17e-4a8af1e675b2") @XmlAttribute(name = "type", required = true) protected VariationDependencyEnum type; - @objid ("9384a550-3f9d-4bf7-be47-4ef4147294d9") @XmlElement(required = true) protected List variation; - @objid ("c2234c4d-be21-4821-bf42-e27afb495835") protected ExpressionType condition; /** @@ -76,7 +71,6 @@ public class VariationDependencyType extends IdentifiableType { * Objects of the following type(s) are allowed in the list * {@link VariationDependencyType.Variation } */ - @objid ("feffe7ed-c988-4e0f-b269-cc94e93c255d") public List getVariation() { if (variation == null) { variation = new ArrayList(); @@ -90,7 +84,6 @@ public List * */ - @objid ("c632337d-606e-4611-9c55-1d438caf45ae") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") public static class Variation { - @objid ("5c0f709a-4013-479f-b4c9-e96b660e61af") @XmlAttribute(name = "ref", required = true) @XmlIDREF @XmlSchemaType(name = "IDREF") @@ -159,7 +147,6 @@ public static class Variation { * possible object is * {@link Object } */ - @objid ("76983f00-82a7-47b8-9218-e0bad0009910") public Object getRef() { return ref; } @@ -170,7 +157,6 @@ public Object getRef() { * @param value allowed object is * {@link Object } */ - @objid ("a1ce836b-13c9-410e-bf8c-68343d770c60") public void setRef(Object value) { this.ref = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationType.java index 134a4df..7bfe563 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationType.java @@ -8,7 +8,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour variation-type complex type. @@ -30,7 +29,6 @@ * </complexType> * */ -@objid ("17ffaed7-ec79-4bba-a0a3-251da1922e09") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "variation-type", propOrder = { "hierarchy", @@ -44,17 +42,13 @@ ValueVariationType.class }) public abstract class VariationType extends IdentifiableType { - @objid ("35fb03f9-d11c-4dc8-b42a-13726bff571a") @XmlAttribute(name = "selected") protected Boolean selected; - @objid ("59741bc7-c3f8-4d92-a04e-d8a4000a486c") protected VariationpointHierarchyType hierarchy; - @objid ("83919641-249f-4746-ab2a-734693b9cd62") protected List depencency; - @objid ("b197d672-7d74-421a-9c8d-a8407c4b5377") @XmlElement(name = "corresponding-variable-artifact-element") protected List correspondingVariableArtifactElement; @@ -64,7 +58,6 @@ public abstract class VariationType extends IdentifiableType { * possible object is * {@link VariationpointHierarchyType } */ - @objid ("1753b6d9-8b48-41a9-af6d-e161464e2168") public VariationpointHierarchyType getHierarchy() { return hierarchy; } @@ -75,7 +68,6 @@ public VariationpointHierarchyType getHierarchy() { * @param value allowed object is * {@link VariationpointHierarchyType } */ - @objid ("6133a9b4-5a5c-4700-b8f5-0745a51dd52d") public void setHierarchy(VariationpointHierarchyType value) { this.hierarchy = value; } @@ -100,7 +92,6 @@ public void setHierarchy(VariationpointHierarchyType value) { * Objects of the following type(s) are allowed in the list * {@link VariationDependencyType } */ - @objid ("02bac9dd-8814-434d-8fdc-42c8ed3fffbb") public List getDepencency() { if (depencency == null) { depencency = new ArrayList(); @@ -128,7 +119,6 @@ public List getDepencency() { * Objects of the following type(s) are allowed in the list * {@link ArtifactElementType } */ - @objid ("f473a4d0-bbf5-4481-b6ec-04ac0b1303fc") public List getCorrespondingVariableArtifactElement() { if (correspondingVariableArtifactElement == null) { correspondingVariableArtifactElement = new ArrayList(); @@ -142,7 +132,6 @@ public List getCorrespondingVariableArtifactElement() { * possible object is * {@link Boolean } */ - @objid ("5fbbac13-985b-46dd-a04f-d9f3f9f750a7") public Boolean isSelected() { return selected; } @@ -153,7 +142,6 @@ public Boolean isSelected() { * @param value allowed object is * {@link Boolean } */ - @objid ("f055ec85-db5b-4b27-b80f-63f34946ab3b") public void setSelected(Boolean value) { this.selected = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationpointHierarchyType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationpointHierarchyType.java index 3b4b7ff..813d860 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationpointHierarchyType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationpointHierarchyType.java @@ -9,7 +9,6 @@ import javax.xml.bind.annotation.XmlIDREF; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour variationpoint-hierarchy-type complex type. @@ -36,13 +35,11 @@ * </complexType> * */ -@objid ("a9b3600f-553e-4984-8bb9-5c5a5a25f8b6") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "variationpoint-hierarchy-type", propOrder = { "variationpoint" }) public class VariationpointHierarchyType extends IdentifiableType { - @objid ("242cc1f4-60ff-40cf-8912-b3b3e3093126") @XmlElement(required = true) protected List variationpoint; @@ -66,7 +63,6 @@ public class VariationpointHierarchyType extends IdentifiableType { * Objects of the following type(s) are allowed in the list * {@link VariationpointHierarchyType.Variationpoint } */ - @objid ("1d421bcd-8bbd-4550-9a9e-3cb171d04eaa") public List getVariationpoint() { if (variationpoint == null) { variationpoint = new ArrayList(); @@ -89,11 +85,9 @@ public List * */ - @objid ("7f127a3a-3302-42e6-bf96-9dbfa136a5ad") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") public static class Variationpoint { - @objid ("487e0f97-0c80-41da-917f-af4e99f0d787") @XmlAttribute(name = "ref", required = true) @XmlIDREF @XmlSchemaType(name = "IDREF") @@ -105,7 +99,6 @@ public static class Variationpoint { * possible object is * {@link Object } */ - @objid ("4e9398f1-eb70-47d8-aea0-f3b4ab31b635") public Object getRef() { return ref; } @@ -116,7 +109,6 @@ public Object getRef() { * @param value allowed object is * {@link Object } */ - @objid ("fecc54cf-3da0-4746-9767-73f70ba5950e") public void setRef(Object value) { this.ref = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationpointType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationpointType.java index 9b49f6b..7c36118 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationpointType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/VariationpointType.java @@ -7,7 +7,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour variationpoint-type complex type. @@ -27,7 +26,6 @@ * </complexType> * */ -@objid ("b1e8bfc7-5fcd-4899-ae04-d3dfe62caf31") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "variationpoint-type", propOrder = { "bindingtime", @@ -40,10 +38,8 @@ XorStructuralVariationpointType.class }) public abstract class VariationpointType extends IdentifiableType { - @objid ("2d721b34-f29e-448a-a615-bc4613c9d6dd") protected List bindingtime; - @objid ("92c363bd-a502-401f-a372-fb180ce09c92") @XmlElement(name = "corresponding-variable-artifact-element") protected List correspondingVariableArtifactElement; @@ -67,7 +63,6 @@ public abstract class VariationpointType extends IdentifiableType { * Objects of the following type(s) are allowed in the list * {@link BindingtimeType } */ - @objid ("2e5fbbc7-5066-42e7-ad10-57f58a38b8d9") public List getBindingtime() { if (bindingtime == null) { bindingtime = new ArrayList(); @@ -95,7 +90,6 @@ public List getBindingtime() { * Objects of the following type(s) are allowed in the list * {@link ArtifactElementType } */ - @objid ("0f91755c-9f29-42f5-83e0-1ddff2f2e6d9") public List getCorrespondingVariableArtifactElement() { if (correspondingVariableArtifactElement == null) { correspondingVariableArtifactElement = new ArrayList(); @@ -103,7 +97,6 @@ public List getCorrespondingVariableArtifactElement() { return this.correspondingVariableArtifactElement; } - @objid ("a07f0c3e-5249-4f3c-a8eb-7774ecc87ee7") public abstract List getVariations(); } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorParameterVariationpointType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorParameterVariationpointType.java index c22aa43..85e4803 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorParameterVariationpointType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorParameterVariationpointType.java @@ -6,7 +6,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour xor-parameter-variationpoint-type complex type. @@ -25,13 +24,11 @@ * </complexType> * */ -@objid ("27520518-de90-4908-8121-4f9c44784524") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "xor-parameter-variationpoint-type", propOrder = { "variation" }) public class XorParameterVariationpointType extends VariationpointType { - @objid ("d4ae4548-ebb9-4ee0-85f3-440e269bf152") @XmlElement(required = true) protected List variation; @@ -55,7 +52,6 @@ public class XorParameterVariationpointType extends VariationpointType { * Objects of the following type(s) are allowed in the list * {@link ValueVariationType } */ - @objid ("5ea6f1cd-612f-4c44-9237-cf230f8436d4") public List getVariation() { if (variation == null) { variation = new ArrayList(); @@ -63,7 +59,6 @@ public List getVariation() { return this.variation; } - @objid ("8f462aec-7467-4d61-ab53-7f6658bce583") @Override public List getVariations() { return new ArrayList(getVariation()); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorStructuralVariationpointType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorStructuralVariationpointType.java index 08d348e..4bf7825 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorStructuralVariationpointType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorStructuralVariationpointType.java @@ -6,7 +6,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour xor-structural-variationpoint-type complex type. @@ -25,13 +24,11 @@ * </complexType> * */ -@objid ("68399df0-ceb8-4b75-9d68-99cfe45f8aa7") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "xor-structural-variationpoint-type", propOrder = { "variation" }) public class XorStructuralVariationpointType extends VariationpointType { - @objid ("d9aed60c-5800-4f3d-b9cd-a8b49967a6bc") @XmlElement(required = true) protected List variation; @@ -55,7 +52,6 @@ public class XorStructuralVariationpointType extends VariationpointType { * Objects of the following type(s) are allowed in the list * {@link XorVariationType } */ - @objid ("338ea3b8-c0d4-44fc-9bf4-352d7f5988f9") public List getVariation() { if (variation == null) { variation = new ArrayList(); @@ -63,7 +59,6 @@ public List getVariation() { return this.variation; } - @objid ("81cf339b-26b8-4d83-84fc-9730956c6f32") @Override public List getVariations() { return new ArrayList(getVariation()); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorVariationType.java b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorVariationType.java index 07936ca..66a2925 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorVariationType.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/variabilitymodel/XorVariationType.java @@ -3,7 +3,6 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; -import com.modeliosoft.modelio.javadesigner.annotations.objid; /** *

    Classe Java pour xor-variation-type complex type. @@ -22,13 +21,11 @@ * </complexType> * */ -@objid ("2872ef4b-5b26-49a1-b274-39afea95bb95") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "xor-variation-type", propOrder = { "condition" }) public class XorVariationType extends VariationType { - @objid ("c8d9e74b-c323-4b24-8dec-0018f4085ce6") protected ExpressionType condition; /** @@ -37,7 +34,6 @@ public class XorVariationType extends VariationType { * possible object is * {@link ExpressionType } */ - @objid ("872a3b3a-4e4c-4740-a982-246001d10fa4") public ExpressionType getCondition() { return condition; } @@ -48,7 +44,6 @@ public ExpressionType getCondition() { * @param value allowed object is * {@link ExpressionType } */ - @objid ("41b89ea2-806f-4fa1-9382-b1d6a8076ab6") public void setCondition(ExpressionType value) { this.condition = value; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/VELDescriptionGenerator.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/VELDescriptionGenerator.java index fcf978e..68eba5a 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/VELDescriptionGenerator.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/VELDescriptionGenerator.java @@ -1,11 +1,8 @@ package org.modelio.module.variabilitydesigner.vel.generation; import java.io.File; -import com.modeliosoft.modelio.javadesigner.annotations.objid; -@objid ("1c9e8c89-532c-48eb-a413-e1efa3f81912") public class VELDescriptionGenerator { - @objid ("9d44a96b-83f3-496a-a1cd-c53699ab7236") public File generateFile(Package root) { return null; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/VariabilityModelGenerator.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/VariabilityModelGenerator.java index 44e6fa0..63eb385 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/VariabilityModelGenerator.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/VariabilityModelGenerator.java @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Map; import javax.xml.bind.JAXBElement; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.metamodel.uml.statik.Package; import org.modelio.module.variabilitydesigner.utils.uml.CompositionUMLElement; import org.modelio.module.variabilitydesigner.utils.uml.IUMLElement; @@ -16,9 +15,7 @@ import org.modelio.module.variabilitydesigner.variabilitymodel.VariationpointType; import org.modelio.module.variabilitydesigner.vel.generation.process.VariabilityModelCreator; -@objid ("c6f73d51-46c0-4553-94b7-bed6e722c3a2") public class VariabilityModelGenerator { - @objid ("b1147dda-8a00-42bf-a301-4182db1738d1") public JAXBElement generate(Package root) { Walker walker = new Walker<>(); @@ -47,7 +44,6 @@ public JAXBElement generate(Package root) { return factory.createVariabilityExchangeModels(models); } - @objid ("f78b4a99-1ab8-412b-88f4-74575c54840e") public JAXBElement generateVariantd(org.modelio.metamodel.uml.statik.Class root) { Walker walker = new Walker<>(); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/process/VariabilityModelCreator.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/process/VariabilityModelCreator.java index bab30f2..d7d2129 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/process/VariabilityModelCreator.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/generation/process/VariabilityModelCreator.java @@ -3,7 +3,6 @@ import java.util.Map; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.metamodel.uml.infrastructure.Constraint; import org.modelio.metamodel.uml.infrastructure.UmlModelElement; import org.modelio.module.variabilitydesigner.api.VariabilityDesignerStereotypes; @@ -26,15 +25,11 @@ import org.modelio.module.variabilitydesigner.variabilitymodel.XorVariationType; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("29b725fd-79f8-41d8-a1e4-8ba8b2844233") public class VariabilityModelCreator extends UMLProcess { - @objid ("9876259f-e5b1-4ce7-bbd0-99cb3ac98b25") private Map _map; - @objid ("7ba15cf7-8ecb-4ea4-82af-b1f0ae7bfc9a") private ObjectFactory _factory; - @objid ("7a5fcfea-71e7-4950-9db1-4e330fff1078") @Override public void process(MObject element) { if (element instanceof Constraint) { @@ -51,14 +46,12 @@ public void process(MObject element) { } } - @objid ("d233f000-fcd5-4a7d-9dc3-9b97ddc82eb3") public VariabilityModelCreator(Map map, ObjectFactory factory) { super(); _map = map; _factory = factory; } - @objid ("2968788a-fdd1-4456-8d4e-531ff6a87a9b") private CalculatedVariationType createCalculatedParameterVariation(Constraint constraint) { CalculatedVariationType res = _factory.createCalculatedVariationType(); @@ -89,7 +82,6 @@ private CalculatedVariationType createCalculatedParameterVariation(Constraint co return res; } - @objid ("ce5fdaa5-9ce2-44b8-9970-9ceb328e1471") private ValueVariationType createValueParameterVariation(Constraint constraint) { ValueVariationType res = _factory.createValueVariationType(); @@ -120,7 +112,6 @@ private ValueVariationType createValueParameterVariation(Constraint constraint) return res; } - @objid ("4a683416-a7cc-41ab-82e8-636fd82800a7") private XorVariationType createXorStructuralVariation(Constraint constraint) { XorVariationType res = _factory.createXorVariationType(); @@ -150,7 +141,6 @@ private XorVariationType createXorStructuralVariation(Constraint constraint) { return res; } - @objid ("325d9aee-5080-4c16-a902-5ba08bdd1c4c") private OptionalVariationType createOptionalStructuralVariation(Constraint constraint) { OptionalVariationType res = _factory.createOptionalVariationType(); @@ -180,7 +170,6 @@ private OptionalVariationType createOptionalStructuralVariation(Constraint const return res; } - @objid ("e5207718-55f2-4fee-9c00-10ea2865bd95") protected void addElementsToRemove(Constraint constraint, VariationType res) { ArtifactElementType artifact = _factory.createArtifactElementType(); for(UmlModelElement element : constraint.getConstrainedElement()) { @@ -189,7 +178,6 @@ protected void addElementsToRemove(Constraint constraint, VariationType res) { res.getCorrespondingVariableArtifactElement().add(artifact); } - @objid ("2a407d59-76fb-49d4-b377-06030025b29f") protected void addParameteredElements(Constraint constraint, VariationType res) { //TODO add checks ? Not needed if used correctly ... ArtifactElementType artifact = _factory.createArtifactElementType(); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/GenerateTrimmedPackage.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/GenerateTrimmedPackage.java index 022cbd8..2f0e075 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/GenerateTrimmedPackage.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/GenerateTrimmedPackage.java @@ -1,7 +1,6 @@ package org.modelio.module.variabilitydesigner.vel.imports; import java.util.Set; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.eclipse.swt.widgets.Display; import org.modelio.api.modelio.diagram.IDiagramGraphic; import org.modelio.api.modelio.diagram.IDiagramHandle; @@ -30,9 +29,7 @@ import org.modelio.module.variabilitydesigner.utils.walkers.Walker; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("414b431b-eaa8-42a6-84b4-9cab301a7277") public class GenerateTrimmedPackage { - @objid ("0f3d28dc-f92f-4606-b792-967ae1fdce01") public void generate(IModuleContext ctx, TrimmingData data, org.modelio.metamodel.uml.statik.Class variant) { Package pack = null; @@ -65,7 +62,6 @@ public void generate(IModuleContext ctx, TrimmingData data, org.modelio.metamode } } - @objid ("708b2340-3c7c-436d-8866-bfb7d6fa3ee7") public void remove(Element element, IModuleContext ctx) { for(AbstractDiagram diagramElement : element.getDiagramElement()) { IDiagramHandle diagramHandle = ctx.getModelioServices().getDiagramService().getDiagramHandle(diagramElement); @@ -78,7 +74,6 @@ public void remove(Element element, IModuleContext ctx) { element.delete(); } - @objid ("c8a65018-f9fc-4a9a-a381-250a91457d65") private void trim(IModuleContext ctx, TrimmingData data, Package cloned) { Set elementsToKeep = data.getElementsToKeep(); @@ -118,7 +113,6 @@ public void process(MObject mobj) { walker.walk(new CompositionUMLElement(cloned)); } - @objid ("2e32a73a-f3c6-40ac-97e5-fe1c97de02df") private void check(Package cloned, ReportModel rm) { Walker walker = new Walker<>(); walker.setProcess(new UMLProcess() { diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/ImportVELConfiguration.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/ImportVELConfiguration.java index 14bbdf3..58b5b51 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/ImportVELConfiguration.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/ImportVELConfiguration.java @@ -5,12 +5,9 @@ import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.module.variabilitydesigner.variabilitymodel.VariabilityExchangeModelsType; -@objid ("359953ba-7c51-4a9d-9f7a-95052a321dd2") public class ImportVELConfiguration { - @objid ("bbb60225-224c-43c0-a2f9-21aaae272bac") public VariabilityExchangeModelsType importVelFile(File file) { try { JAXBContext context = JAXBContext.newInstance(VariabilityExchangeModelsType.class); diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/MAttributeValue.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/MAttributeValue.java index 93c864a..9d28537 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/MAttributeValue.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/MAttributeValue.java @@ -1,32 +1,24 @@ package org.modelio.module.variabilitydesigner.vel.imports; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.vcore.smkernel.mapi.MAttribute; -@objid ("a6c98579-55f8-4c8e-89e2-0e3d754c8d90") public class MAttributeValue { - @objid ("55a345d8-9ce9-417d-88a2-f181c7f1b4e0") private String _value; - @objid ("94221444-b44c-4706-9124-732edd1abcd8") private MAttribute _mAttribute; - @objid ("06ec688c-4da8-477c-9d59-0baf8ffc6390") public String getValue() { return _value; } - @objid ("ec88382a-90dd-450d-bbce-2fbef0e7ecb5") public void setValue(String value) { _value = value; } - @objid ("e542b074-4c4d-4cd3-9b84-a4b7b102a753") public MAttribute getmAttribute() { return _mAttribute; } - @objid ("6fb604a5-c7c2-4e16-a5cb-a49981facd6f") public void setmAttribute(MAttribute mAttribute) { _mAttribute = mAttribute; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/TrimmingData.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/TrimmingData.java index 336c41e..daef36c 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/TrimmingData.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/TrimmingData.java @@ -1,23 +1,18 @@ package org.modelio.module.variabilitydesigner.vel.imports; import java.util.Set; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.module.variabilitydesigner.utils.specialcollections.SpecialSet; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("7a5b62d4-d966-4049-a068-e0540635e949") public class TrimmingData { - @objid ("5224d94a-335d-4aa8-8024-86a00b551fe1") private Set _elementsToKeep = new SpecialSet(); // @objid ("adf7f1e4-8d32-4eb0-b365-13053e84fcae") // private Map> _parameterToSet = new HashMap(); - @objid ("9a6bd932-8d17-4faa-8ed0-b18dc72f0d8e") public Set getElementsToKeep() { return this._elementsToKeep; } - @objid ("49ec0928-a655-40bc-b4bf-c54c64cffca1") public void setElementsToKeep(Set elementsToKeep) { this._elementsToKeep = elementsToKeep; } diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/TrimmingDataGenerator.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/TrimmingDataGenerator.java index 07594ba..96cbe95 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/TrimmingDataGenerator.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/TrimmingDataGenerator.java @@ -6,7 +6,6 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import com.modeliosoft.modelio.javadesigner.annotations.objid; import org.modelio.api.modelio.model.IModelingSession; import org.modelio.api.module.context.IModuleContext; import org.modelio.metamodel.uml.infrastructure.Dependency; @@ -28,9 +27,7 @@ import org.modelio.module.variabilitydesigner.variabilitymodel.XorStructuralVariationpointType; import org.modelio.vcore.smkernel.mapi.MObject; -@objid ("8b61a3da-6fa3-453f-8c9e-c532beef68de") public class TrimmingDataGenerator { - @objid ("6d905090-33d9-46e1-8e6a-f57989bc980a") public TrimmingData generate(VariabilityExchangeModelsType variabilityExchangeModelsType, IModuleContext ctx) { TrimmingData result = new TrimmingData(); @@ -42,7 +39,6 @@ public TrimmingData generate(VariabilityExchangeModelsType variabilityExchangeMo return result; } - @objid ("bbc0aa3d-66d2-492d-9d45-73906bd2d215") private Set buildSetOfElementsToRemove(IModelingSession modelingSession, Set uuids) { Set set = new SpecialSet(); for(String uuid : uuids) { @@ -51,7 +47,6 @@ private Set buildSetOfElementsToRemove(IModelingSession modelingSession return set; } - @objid ("5f4003d6-a073-432a-abb5-28a2225e9f36") private Set fetchUUidsToRemove(VariabilityExchangeModelsType variabilityExchangeModelsType) { Set selected = new HashSet<>(); Set unselected = new HashSet<>(); @@ -72,7 +67,6 @@ private Set fetchUUidsToRemove(VariabilityExchangeModelsType variability return unselected; } - @objid ("d6274e37-ffdb-4a89-b817-770fbeb453d1") private void extractUUIDs(VariationpointType variationpoint, Set selected, Set unselected) { for(VariationType variation : variationpoint.getVariations()) { Set toAdd; @@ -93,7 +87,6 @@ private void extractUUIDs(VariationpointType variationpoint, Set selecte } } - @objid ("3e690387-7890-4700-945a-2d9c178e040a") private Map> getParameterHandling(IModelingSession modelingSession, VariabilityExchangeModelsType variabilityExchangeModelsType) { VariabilityExchangeModelType model = variabilityExchangeModelsType.getVariabilityExchangeModel().get(0); @@ -124,7 +117,6 @@ private Map> getParameterHandling(IModeling return parameterSetup; } - @objid ("54085072-6c9d-4100-bf48-ea0a521b147f") private void addElementToCollectionMap(Map> map, T key, K value, Supplier> supplier) { Collection col = map.get(key); if(col == null) { @@ -137,7 +129,6 @@ private void addElementToCollectionMap(Map> map, T key, K } } - @objid ("beda3d15-0340-4c1d-8083-4480f9afc453") public TrimmingData generate(IModuleContext ctx, org.modelio.metamodel.uml.statik.Class variant) { TrimmingData result = new TrimmingData(); @@ -147,7 +138,6 @@ public TrimmingData generate(IModuleContext ctx, org.modelio.metamodel.uml.stati return result; } - @objid ("cbe4fa1e-5dac-4faa-b227-4fe5591b490c") private Set getFeatures(Class variant) { Set set = new SpecialSet(); for(Dependency dep : variant.getDependsOnDependency()) { diff --git a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/VariabilityModelImportor.java b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/VariabilityModelImportor.java index f17146e..c8f66e8 100644 --- a/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/VariabilityModelImportor.java +++ b/src/main/java/org/modelio/module/variabilitydesigner/vel/imports/VariabilityModelImportor.java @@ -15,36 +15,33 @@ import org.modelio.module.variabilitydesigner.variabilitymodel.VariationpointType; import org.modelio.module.variabilitydesigner.vel.generation.process.VariabilityModelCreator; - public class VariabilityModelImportor { - public JAXBElement imports(Package root) { Walker walker = new Walker<>(); - + Map map = new HashMap<>(); ObjectFactory factory = new ObjectFactory(); - + walker.setProcess(new VariabilityModelCreator(map, factory)); walker.walk(new CompositionUMLElement(root)); - + VariabilityExchangeModelType exchangemodel = factory.createVariabilityExchangeModelType(); exchangemodel.setId(root.getName()); exchangemodel.setType(VariabilityApiEnum.VARIATIONPOINT_DESCRIPTION); exchangemodel.getVariationpointGroup().addAll(map.values()); - + VariabilityExchangeModelsType models = factory.createVariabilityExchangeModelsType(); models.setId("root"); models.getVariabilityExchangeModel().add(exchangemodel); - + CapabilityType capability = factory.createCapabilityType(); capability.setExportVariabilityExchangeModel(true); capability.setGetConfiguration(true); capability.setImportVariabilityExchangeModel(true); capability.setSetConfiguration(true); - + models.setCapability(capability); return factory.createVariabilityExchangeModels(models); } - }