Skip to content

Commit 8a7d120

Browse files
etiennebrosseetiennebrosse
committed
fixes exporter
1 parent 3a32424 commit 8a7d120

File tree

53 files changed

+1107
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1107
-122
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- definition -->
66
<groupId>fr.softeam</groupId>
77
<artifactId>cameldesigner</artifactId>
8-
<version>1.0.06</version>
8+
<version>1.0.07</version>
99
<name>CamelDesigner</name>
1010
<repositories>
1111
<repository>

‎src/main/conf/module.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ tool.IfThen_Constraint.tooltip=
929929
tool.ImageRequirement.label=ImageRequirement
930930
tool.ImageRequirement.tooltip=
931931
tool.LocationModel.label=LocationModel
932-
tool.LocationModel.tooltip=
932+
tool.LocationModel.tooltip=Create a Location Model
933933
tool.LocationRequirement.label=LocationRequirement
934934
tool.LocationRequirement.tooltip=
935935
tool.Location_Coupling.label=Location_Coupling

‎src/main/conf/module.xml‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
<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="">
33
<ClassPath>
44
<PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
5-
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
6-
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
7-
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
8-
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
9-
<PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
105
<PathEntry path="lib/inject-3.0.0.jar"/>
116
<PathEntry path="lib/registry-3.7.0.jar"/>
127
<PathEntry path="lib/xtext-2.12.0.jar"/>
@@ -1932,7 +1927,7 @@
19321927
</Tool>
19331928
<Tool id="LocationModel" label="%tool.LocationModel.label" tooltip="%tool.LocationModel.tooltip" image="res/icon/gui/locationModel_24.png">
19341929
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
1935-
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateLocationModel">
1930+
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateLocationModelTool">
19361931
<HParameter name="stereotype" value="CamelDesigner#LocationModel"/>
19371932
<HParameter name="metaclass" value="Standard.Package"/>
19381933
<HParameter name="name" value="LocationModel"/>
@@ -2013,7 +2008,7 @@
20132008
</Tool>
20142009
<Tool id="MetricInstanceModel" label="%tool.MetricInstanceModel.label" tooltip="%tool.MetricInstanceModel.tooltip" image="res/icon/gui/MetricInstanceModel_24.png">
20152010
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
2016-
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateMetricInstanceModel">
2011+
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateMetricInstanceModelTool">
20172012
<HParameter name="stereotype" value="CamelDesigner#MetricInstanceModel"/>
20182013
<HParameter name="metaclass" value="Standard.Package"/>
20192014
<HParameter name="name" value="MetricInstanceModel"/>
@@ -2133,7 +2128,7 @@
21332128
</Tool>
21342129
<Tool id="OrganisationModel" label="%tool.OrganisationModel.label" tooltip="%tool.OrganisationModel.tooltip" image="res/icon/gui/organisationModel_24.png">
21352130
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
2136-
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateOrganisationModel">
2131+
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateOrganisationModelTool">
21372132
<HParameter name="stereotype" value="CamelDesigner#OrganisationModel"/>
21382133
<HParameter name="metaclass" value="Standard.Package"/>
21392134
<HParameter name="name" value="OrganisationModel"/>
@@ -2294,7 +2289,7 @@
22942289
</Tool>
22952290
<Tool id="ScalabilityModel" label="%tool.ScalabilityModel.label" tooltip="%tool.ScalabilityModel.tooltip" image="res/icon/gui/scalabilityModel_24.png">
22962291
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
2297-
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateScalabilityModel">
2292+
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateScalabilityModelTool">
22982293
<HParameter name="stereotype" value="CamelDesigner#ScalabilityModel"/>
22992294
<HParameter name="metaclass" value="Standard.Package"/>
23002295
<HParameter name="name" value="ScalabilityModel"/>
@@ -2333,8 +2328,8 @@
23332328
</Handler>
23342329
</Tool>
23352330
<Tool id="SecurityModel" label="%tool.SecurityModel.label" tooltip="%tool.SecurityModel.tooltip" image="res/icon/gui/securityModel_24.png">
2336-
<Scope-source metaclass="Standard.Package" stereotype=""/>
2337-
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateSecurityModel">
2331+
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
2332+
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateSecurityModelTool">
23382333
<HParameter name="stereotype" value="CamelDesigner#SecurityModel"/>
23392334
<HParameter name="metaclass" value="Standard.Package"/>
23402335
<HParameter name="name" value="SecurityModel"/>
@@ -2454,7 +2449,7 @@
24542449
</Tool>
24552450
<Tool id="TypeModel" label="%tool.TypeModel.label" tooltip="%tool.TypeModel.tooltip" image="res/icon/gui/typeModel_24.png">
24562451
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
2457-
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateTypeModel">
2452+
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateTypeModelTool">
24582453
<HParameter name="stereotype" value="CamelDesigner#TypeModel"/>
24592454
<HParameter name="metaclass" value="Standard.Package"/>
24602455
<HParameter name="name" value="Type Model"/>
@@ -2478,7 +2473,7 @@
24782473
</Tool>
24792474
<Tool id="UnitModel" label="%tool.UnitModel.label" tooltip="%tool.UnitModel.tooltip" image="res/icon/gui/unitModel_24.png">
24802475
<Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
2481-
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateUnitModel">
2476+
<Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateUnitModelTool">
24822477
<HParameter name="stereotype" value="CamelDesigner#UnitModel"/>
24832478
<HParameter name="metaclass" value="Standard.Package"/>
24842479
<HParameter name="name" value="Unit Model"/>

‎src/main/conf/res/generated/patterns/framework.umlt‎

-5 Bytes
Binary file not shown.

‎src/main/conf/res/icon.zip‎

653 KB
Binary file not shown.

‎src/main/java/fr/softeam/cameldesigner/api/metadatamodel/infrastructure/modelelement/MmsObject.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
import java.util.ArrayList;
1010
import java.util.List;
1111
import com.modeliosoft.modelio.javadesigner.annotations.objid;
12+
import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
13+
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.CamelElement;
14+
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.NamedElement;
15+
import fr.softeam.cameldesigner.api.metadatamodel.standard.attribute.MmsProperty;
16+
import fr.softeam.cameldesigner.api.metadatamodel.standard.attributelink.MmsPropertyInstance;
17+
import fr.softeam.cameldesigner.api.metadatamodel.standard.class_.MmsConcept;
18+
import fr.softeam.cameldesigner.api.metadatamodel.standard.instance.MmsConceptInstance;
19+
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
1220
import org.modelio.api.module.context.IModuleContext;
1321
import org.modelio.metamodel.uml.infrastructure.ModelElement;
1422
import org.modelio.metamodel.uml.infrastructure.Stereotype;
@@ -18,14 +26,6 @@
1826
import org.modelio.metamodel.uml.statik.Class;
1927
import org.modelio.metamodel.uml.statik.Instance;
2028
import org.modelio.vcore.smkernel.mapi.MObject;
21-
import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
22-
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.CamelElement;
23-
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.NamedElement;
24-
import fr.softeam.cameldesigner.api.metadatamodel.standard.attribute.MmsProperty;
25-
import fr.softeam.cameldesigner.api.metadatamodel.standard.attributelink.MmsPropertyInstance;
26-
import fr.softeam.cameldesigner.api.metadatamodel.standard.class_.MmsConcept;
27-
import fr.softeam.cameldesigner.api.metadatamodel.standard.instance.MmsConceptInstance;
28-
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
2929

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

8383
/**
8484
* Get the underlying {@link ModelElement}.
85+
*
8586
* @return the ModelElement represented by this proxy, never null.
8687
*/
8788
@objid ("82dd51a7-b77e-4569-b2d3-ba1f679cb980")
@@ -176,11 +177,11 @@ public static void init(final IModuleContext ctx) {
176177
}
177178

178179

179-
static {
180-
if(CamelDesignerModule.getInstance() != null) {
181-
init(CamelDesignerModule.getInstance().getModuleContext());
182-
}
183-
}
180+
static {
181+
if(CamelDesignerModule.getInstance() != null) {
182+
init(CamelDesignerModule.getInstance().getModuleContext());
183+
}
184+
}
184185
}
185186

186187
}

‎src/main/java/fr/softeam/cameldesigner/exchange/exporter/constraint/AttributeConstraintExporter.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package fr.softeam.cameldesigner.exchange.exporter.constraint;
2+
3+
import org.eclipse.emf.cdo.CDOObject;
4+
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.AttributeConstraint;
5+
6+
public abstract class AttributeConstraintExporter<T extends AttributeConstraint> extends UnaryConstraintExporter<T>{
7+
8+
public AttributeConstraintExporter(T elt) {
9+
super(elt);
10+
}
11+
12+
13+
@Override
14+
public CDOObject createCamelElt(CDOObject context) {
15+
return super.createCamelElt(context);
16+
}
17+
18+
19+
@Override
20+
public void setProperties(CDOObject elt) {
21+
super.setProperties(elt);
22+
}
23+
24+
25+
@Override
26+
public void attach(CDOObject elt, CDOObject context) {
27+
super.attach(elt, context);
28+
}
29+
30+
}

‎src/main/java/fr/softeam/cameldesigner/exchange/exporter/constraint/CompositeConstraintExporter.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package fr.softeam.cameldesigner.exchange.exporter.constraint;
2+
3+
import org.eclipse.emf.cdo.CDOObject;
4+
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.CompositeConstraint;
5+
6+
public abstract class CompositeConstraintExporter<T extends CompositeConstraint> extends ConstraintExporter<T>{
7+
8+
public CompositeConstraintExporter(T elt) {
9+
super(elt);
10+
}
11+
12+
13+
@Override
14+
public CDOObject createCamelElt(CDOObject context) {
15+
return super.createCamelElt(context);
16+
}
17+
18+
19+
@Override
20+
public void setProperties(CDOObject elt) {
21+
super.setProperties(elt);
22+
}
23+
24+
25+
@Override
26+
public void attach(CDOObject elt, CDOObject context) {
27+
super.attach(elt, context);
28+
}
29+
30+
}

‎src/main/java/fr/softeam/cameldesigner/exchange/exporter/constraint/ConstraintExporter.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package fr.softeam.cameldesigner.exchange.exporter.constraint;
2+
3+
import org.eclipse.emf.cdo.CDOObject;
4+
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.CamelConstraint;
5+
import fr.softeam.cameldesigner.exchange.exporter.core.ExpendableElementExporter;
6+
7+
public abstract class ConstraintExporter<T extends CamelConstraint> extends ExpendableElementExporter<T>{
8+
9+
public ConstraintExporter(T elt) {
10+
super(elt);
11+
}
12+
13+
14+
@Override
15+
public CDOObject createCamelElt(CDOObject context) {
16+
return super.createCamelElt(context);
17+
}
18+
19+
20+
@Override
21+
public void setProperties(CDOObject elt) {
22+
super.setProperties(elt);
23+
}
24+
25+
26+
@Override
27+
public void attach(CDOObject elt, CDOObject context) {
28+
if ((context instanceof camel.constraint.ConstraintModel) && (elt instanceof camel.constraint.Constraint)) {
29+
((camel.constraint.ConstraintModel) context).getConstraints().add((camel.constraint.Constraint) elt);
30+
}else {
31+
super.attach(elt, context);
32+
}
33+
}
34+
35+
}

‎src/main/java/fr/softeam/cameldesigner/exchange/exporter/constraint/IfThenConstraintExporter.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package fr.softeam.cameldesigner.exchange.exporter.constraint;
2+
3+
import org.eclipse.emf.cdo.CDOObject;
4+
import camel.constraint.ConstraintFactory;
5+
import fr.softeam.cameldesigner.api.constraintmodel.standard.constraint.IfThenConstraint;
6+
7+
public class IfThenConstraintExporter<T extends IfThenConstraint> extends CompositeConstraintExporter<T>{
8+
9+
public IfThenConstraintExporter(T elt) {
10+
super(elt);
11+
}
12+
13+
14+
@Override
15+
public CDOObject createCamelElt(CDOObject context) {
16+
return ConstraintFactory.eINSTANCE.createIfThenConstraint();
17+
}
18+
19+
20+
@Override
21+
public void setProperties(CDOObject elt) {
22+
super.setProperties(elt);
23+
}
24+
25+
26+
@Override
27+
public void attach(CDOObject elt, CDOObject context) {
28+
super.attach(elt, context);
29+
}
30+
31+
}

0 commit comments

Comments
 (0)