Skip to content

Commit

Permalink
fixes exporter
Browse files Browse the repository at this point in the history
  • Loading branch information
etiennebrosse committed Mar 22, 2022
1 parent 3a32424 commit 8a7d120
Show file tree
Hide file tree
Showing 53 changed files with 1,107 additions and 122 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- definition -->
<groupId>fr.softeam</groupId>
<artifactId>cameldesigner</artifactId>
<version>1.0.06</version>
<version>1.0.07</version>
<name>CamelDesigner</name>
<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion src/main/conf/module.properties
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ tool.IfThen_Constraint.tooltip=
tool.ImageRequirement.label=ImageRequirement
tool.ImageRequirement.tooltip=
tool.LocationModel.label=LocationModel
tool.LocationModel.tooltip=
tool.LocationModel.tooltip=Create a Location Model
tool.LocationRequirement.label=LocationRequirement
tool.LocationRequirement.tooltip=
tool.Location_Coupling.label=Location_Coupling
Expand Down
21 changes: 8 additions & 13 deletions src/main/conf/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<Module id="${project.name}" class="fr.softeam.cameldesigner.impl.CamelDesignerModule" binaryversion="4.1.0" version="${project.version}" schema-level="2" uid="dc1688c2-8bd2-4585-a786-b1b5877996d7" author="Softeam" image="" url="">
<ClassPath>
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
<PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
<PathEntry path="lib/inject-3.0.0.jar"/>
<PathEntry path="lib/registry-3.7.0.jar"/>
<PathEntry path="lib/xtext-2.12.0.jar"/>
Expand Down Expand Up @@ -1932,7 +1927,7 @@
</Tool>
<Tool id="LocationModel" label="%tool.LocationModel.label" tooltip="%tool.LocationModel.tooltip" image="res/icon/gui/locationModel_24.png">
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateLocationModel">
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateLocationModelTool">
<HParameter name="stereotype" value="CamelDesigner#LocationModel"/>
<HParameter name="metaclass" value="Standard.Package"/>
<HParameter name="name" value="LocationModel"/>
Expand Down Expand Up @@ -2013,7 +2008,7 @@
</Tool>
<Tool id="MetricInstanceModel" label="%tool.MetricInstanceModel.label" tooltip="%tool.MetricInstanceModel.tooltip" image="res/icon/gui/MetricInstanceModel_24.png">
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateMetricInstanceModel">
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateMetricInstanceModelTool">
<HParameter name="stereotype" value="CamelDesigner#MetricInstanceModel"/>
<HParameter name="metaclass" value="Standard.Package"/>
<HParameter name="name" value="MetricInstanceModel"/>
Expand Down Expand Up @@ -2133,7 +2128,7 @@
</Tool>
<Tool id="OrganisationModel" label="%tool.OrganisationModel.label" tooltip="%tool.OrganisationModel.tooltip" image="res/icon/gui/organisationModel_24.png">
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateOrganisationModel">
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateOrganisationModelTool">
<HParameter name="stereotype" value="CamelDesigner#OrganisationModel"/>
<HParameter name="metaclass" value="Standard.Package"/>
<HParameter name="name" value="OrganisationModel"/>
Expand Down Expand Up @@ -2294,7 +2289,7 @@
</Tool>
<Tool id="ScalabilityModel" label="%tool.ScalabilityModel.label" tooltip="%tool.ScalabilityModel.tooltip" image="res/icon/gui/scalabilityModel_24.png">
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateScalabilityModel">
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateScalabilityModelTool">
<HParameter name="stereotype" value="CamelDesigner#ScalabilityModel"/>
<HParameter name="metaclass" value="Standard.Package"/>
<HParameter name="name" value="ScalabilityModel"/>
Expand Down Expand Up @@ -2333,8 +2328,8 @@
</Handler>
</Tool>
<Tool id="SecurityModel" label="%tool.SecurityModel.label" tooltip="%tool.SecurityModel.tooltip" image="res/icon/gui/securityModel_24.png">
<Scope-source metaclass="Standard.Package" stereotype=""/>
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateSecurityModel">
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateSecurityModelTool">
<HParameter name="stereotype" value="CamelDesigner#SecurityModel"/>
<HParameter name="metaclass" value="Standard.Package"/>
<HParameter name="name" value="SecurityModel"/>
Expand Down Expand Up @@ -2454,7 +2449,7 @@
</Tool>
<Tool id="TypeModel" label="%tool.TypeModel.label" tooltip="%tool.TypeModel.tooltip" image="res/icon/gui/typeModel_24.png">
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateTypeModel">
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateTypeModelTool">
<HParameter name="stereotype" value="CamelDesigner#TypeModel"/>
<HParameter name="metaclass" value="Standard.Package"/>
<HParameter name="name" value="Type Model"/>
Expand All @@ -2478,7 +2473,7 @@
</Tool>
<Tool id="UnitModel" label="%tool.UnitModel.label" tooltip="%tool.UnitModel.tooltip" image="res/icon/gui/unitModel_24.png">
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateUnitModel">
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateUnitModelTool">
<HParameter name="stereotype" value="CamelDesigner#UnitModel"/>
<HParameter name="metaclass" value="Standard.Package"/>
<HParameter name="name" value="Unit Model"/>
Expand Down
Binary file modified src/main/conf/res/generated/patterns/framework.umlt
Binary file not shown.
Binary file added src/main/conf/res/icon.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
import java.util.ArrayList;
import java.util.List;
import com.modeliosoft.modelio.javadesigner.annotations.objid;
import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.CamelElement;
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.NamedElement;
import fr.softeam.cameldesigner.api.metadatamodel.standard.attribute.MmsProperty;
import fr.softeam.cameldesigner.api.metadatamodel.standard.attributelink.MmsPropertyInstance;
import fr.softeam.cameldesigner.api.metadatamodel.standard.class_.MmsConcept;
import fr.softeam.cameldesigner.api.metadatamodel.standard.instance.MmsConceptInstance;
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
import org.modelio.api.module.context.IModuleContext;
import org.modelio.metamodel.uml.infrastructure.ModelElement;
import org.modelio.metamodel.uml.infrastructure.Stereotype;
Expand All @@ -18,14 +26,6 @@
import org.modelio.metamodel.uml.statik.Class;
import org.modelio.metamodel.uml.statik.Instance;
import org.modelio.vcore.smkernel.mapi.MObject;
import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.CamelElement;
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.NamedElement;
import fr.softeam.cameldesigner.api.metadatamodel.standard.attribute.MmsProperty;
import fr.softeam.cameldesigner.api.metadatamodel.standard.attributelink.MmsPropertyInstance;
import fr.softeam.cameldesigner.api.metadatamodel.standard.class_.MmsConcept;
import fr.softeam.cameldesigner.api.metadatamodel.standard.instance.MmsConceptInstance;
import fr.softeam.cameldesigner.impl.CamelDesignerModule;

/**
* Proxy class to handle a {@link ModelElement} with << MmsObject >> stereotype.
Expand All @@ -47,7 +47,7 @@ public abstract class MmsObject extends NamedElement {
* Tells whether a {@link MmsObject proxy} can be instantiated from a {@link MObject} checking it is a {@link ModelElement} stereotyped << MmsObject >>.
* <p>
* The method returns <code>false</code> if the instantiation cannot be carried out.
*
*
* @param elt a model object
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
*/
Expand Down Expand Up @@ -82,6 +82,7 @@ public boolean equals(final Object obj) {

/**
* Get the underlying {@link ModelElement}.
*
* @return the ModelElement represented by this proxy, never null.
*/
@objid ("82dd51a7-b77e-4569-b2d3-ba1f679cb980")
Expand Down Expand Up @@ -176,11 +177,11 @@ public static void init(final IModuleContext ctx) {
}


static {
if(CamelDesignerModule.getInstance() != null) {
init(CamelDesignerModule.getInstance().getModuleContext());
}
}
static {
if(CamelDesignerModule.getInstance() != null) {
init(CamelDesignerModule.getInstance().getModuleContext());
}
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package fr.softeam.cameldesigner.exchange.exporter.constraint;

import org.eclipse.emf.cdo.CDOObject;
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.AttributeConstraint;

public abstract class AttributeConstraintExporter<T extends AttributeConstraint> extends UnaryConstraintExporter<T>{

public AttributeConstraintExporter(T elt) {
super(elt);
}


@Override
public CDOObject createCamelElt(CDOObject context) {
return super.createCamelElt(context);
}


@Override
public void setProperties(CDOObject elt) {
super.setProperties(elt);
}


@Override
public void attach(CDOObject elt, CDOObject context) {
super.attach(elt, context);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package fr.softeam.cameldesigner.exchange.exporter.constraint;

import org.eclipse.emf.cdo.CDOObject;
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.CompositeConstraint;

public abstract class CompositeConstraintExporter<T extends CompositeConstraint> extends ConstraintExporter<T>{

public CompositeConstraintExporter(T elt) {
super(elt);
}


@Override
public CDOObject createCamelElt(CDOObject context) {
return super.createCamelElt(context);
}


@Override
public void setProperties(CDOObject elt) {
super.setProperties(elt);
}


@Override
public void attach(CDOObject elt, CDOObject context) {
super.attach(elt, context);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package fr.softeam.cameldesigner.exchange.exporter.constraint;

import org.eclipse.emf.cdo.CDOObject;
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.CamelConstraint;
import fr.softeam.cameldesigner.exchange.exporter.core.ExpendableElementExporter;

public abstract class ConstraintExporter<T extends CamelConstraint> extends ExpendableElementExporter<T>{

public ConstraintExporter(T elt) {
super(elt);
}


@Override
public CDOObject createCamelElt(CDOObject context) {
return super.createCamelElt(context);
}


@Override
public void setProperties(CDOObject elt) {
super.setProperties(elt);
}


@Override
public void attach(CDOObject elt, CDOObject context) {
if ((context instanceof camel.constraint.ConstraintModel) && (elt instanceof camel.constraint.Constraint)) {
((camel.constraint.ConstraintModel) context).getConstraints().add((camel.constraint.Constraint) elt);
}else {
super.attach(elt, context);
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package fr.softeam.cameldesigner.exchange.exporter.constraint;

import org.eclipse.emf.cdo.CDOObject;
import camel.constraint.ConstraintFactory;
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.IfThenConstraint;

public class IfThenConstraintExporter<T extends IfThenConstraint> extends CompositeConstraintExporter<T>{

public IfThenConstraintExporter(T elt) {
super(elt);
}


@Override
public CDOObject createCamelElt(CDOObject context) {
return ConstraintFactory.eINSTANCE.createIfThenConstraint();
}


@Override
public void setProperties(CDOObject elt) {
super.setProperties(elt);
}


@Override
public void attach(CDOObject elt, CDOObject context) {
super.attach(elt, context);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package fr.softeam.cameldesigner.exchange.exporter.constraint;

import org.eclipse.emf.cdo.CDOObject;
import camel.constraint.ConstraintFactory;
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.LogicalConstraint;

public class LogicalConstraintExporter<T extends LogicalConstraint> extends CompositeConstraintExporter<T>{

public LogicalConstraintExporter(T elt) {
super(elt);
}


@Override
public CDOObject createCamelElt(CDOObject context) {
return ConstraintFactory.eINSTANCE.createLogicalConstraint();
}


@Override
public void setProperties(CDOObject elt) {
super.setProperties(elt);
}


@Override
public void attach(CDOObject elt, CDOObject context) {
super.attach(elt, context);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package fr.softeam.cameldesigner.exchange.exporter.constraint;

import org.eclipse.emf.cdo.CDOObject;
import camel.constraint.ConstraintFactory;
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.MetricConstraint;

public class MetricConstraintExporter<T extends MetricConstraint> extends ConstraintExporter<T>{

public MetricConstraintExporter(T elt) {
super(elt);
}


@Override
public CDOObject createCamelElt(CDOObject context) {
return ConstraintFactory.eINSTANCE.createMetricConstraint();
}


@Override
public void setProperties(CDOObject elt) {
super.setProperties(elt);
}


@Override
public void attach(CDOObject elt, CDOObject context) {
super.attach(elt, context);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package fr.softeam.cameldesigner.exchange.exporter.constraint;

import org.eclipse.emf.cdo.CDOObject;
import camel.constraint.ConstraintFactory;
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.MetricVariableConstraint;

public class MetricVariableConstraintExporter<T extends MetricVariableConstraint> extends UnaryConstraintExporter<T>{

public MetricVariableConstraintExporter(T elt) {
super(elt);
}


@Override
public CDOObject createCamelElt(CDOObject context) {
return ConstraintFactory.eINSTANCE.createMetricVariableConstraint();
}


@Override
public void setProperties(CDOObject elt) {
super.setProperties(elt);
}


@Override
public void attach(CDOObject elt, CDOObject context) {
super.attach(elt, context);
}

}
Loading

0 comments on commit 8a7d120

Please sign in to comment.