Skip to content

Commit c226abc

Browse files
etiennebrosseetiennebrosse
committed
Fixing port creation
1 parent 3b7fc75 commit c226abc

54 files changed

Lines changed: 2027 additions & 3553 deletions

File tree

Some content is hidden

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

‎pom.xml‎

Lines changed: 138 additions & 138 deletions
Large diffs are not rendered by default.

‎src/main/conf/module.properties‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,10 @@ stereotype.DeploymentInstanceModelDiagram.description=
262262
stereotype.DeploymentInstanceModelDiagram.label=DeploymentInstanceModelDiagram
263263
stereotype.DeploymentModel.description=
264264
stereotype.DeploymentModel.label=DeploymentModel
265-
stereotype.DeploymentModelDiagram.description=
266-
stereotype.DeploymentModelDiagram.label=DeploymentModelDiagram
267265
stereotype.DeploymentTypeModel.description=
268266
stereotype.DeploymentTypeModel.label=DeploymentTypeModel
267+
stereotype.DeploymentTypeModelDiagram.description=
268+
stereotype.DeploymentTypeModelDiagram.label=DeploymentTypeModelDiagram
269269
stereotype.DimensionedUnit.description=
270270
stereotype.DimensionedUnit.label=DimensionedUnit
271271
stereotype.Dimensionless.description=
@@ -294,6 +294,8 @@ stereotype.Feature_Artifact.description=
294294
stereotype.Feature_Artifact.label=Feature_Artifact
295295
stereotype.Feature_Class.description=
296296
stereotype.Feature_Class.label=Feature
297+
stereotype.Feature_Connector.description=
298+
stereotype.Feature_Connector.label=Feature
297299
stereotype.Feature_Instance.description=
298300
stereotype.Feature_Instance.label=Feature
299301
stereotype.Feature_Port.description=
@@ -1032,9 +1034,9 @@ wizard.DataModelDiagram.label=DataModelDiagram
10321034
wizard.DeploymentInstanceModelDiagram.detail=
10331035
wizard.DeploymentInstanceModelDiagram.info=
10341036
wizard.DeploymentInstanceModelDiagram.label=DeploymentInstanceModelDiagram
1035-
wizard.DeploymentModelDiagram.detail=
1036-
wizard.DeploymentModelDiagram.info=
1037-
wizard.DeploymentModelDiagram.label=DeploymentModelDiagram
1037+
wizard.DeploymentTypeModelDiagram.detail=
1038+
wizard.DeploymentTypeModelDiagram.info=
1039+
wizard.DeploymentTypeModelDiagram.label=DeploymentTypeModelDiagram
10381040
wizard.ExecutionModelDiagram.detail=
10391041
wizard.ExecutionModelDiagram.info=
10401042
wizard.ExecutionModelDiagram.label=ExecutionModelDiagram

‎src/main/conf/module.xml‎

Lines changed: 978 additions & 2230 deletions
Large diffs are not rendered by default.

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

0 Bytes
Binary file not shown.

‎src/main/java/fr/softeam/cameldesigner/api/CamelDesignerProxyFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
* <li><< MetricModelDiagram >> on a {@link org.modelio.metamodel.diagrams.ClassDiagram}: instantiates a {@link MetricModelDiagram}
5151
* <li><< DataModelDiagram >> on a {@link org.modelio.metamodel.diagrams.ClassDiagram}: instantiates a {@link DataModelDiagram}
5252
* <li><< LocationModelDiagram >> on a {@link org.modelio.metamodel.diagrams.ClassDiagram}: instantiates a {@link LocationModelDiagram}
53-
* <li><< RequirementModelDiagram >> on a {@link org.modelio.metamodel.diagrams.ClassDiagram}: instantiates a {@link RequirementModelDiagram}
53+
* <li><< RequirementModelDiagram >> on a {@link org.modelio.metamodel.diagrams.ClassDiagram}: instantiates a {@link CreateRequirementModelDiagram}
5454
* <li><< ConstraintModelDiagram >> on a {@link org.modelio.metamodel.diagrams.ClassDiagram}: instantiates a {@link ConstraintModelDiagram}
5555
* <li><< MetadataModelDiagram >> on a {@link org.modelio.metamodel.diagrams.ClassDiagram}: instantiates a {@link MetadataModelDiagram}
5656
* <li><< OrganisationModelDiagram >> on a {@link org.modelio.metamodel.diagrams.ClassDiagram}: instantiates a {@link OrganisationModelDiagram}

‎src/main/java/fr/softeam/cameldesigner/api/camelcore/infrastructure/modelelement/CamelElement.java‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,11 @@
66
*/
77
package fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement;
88

9-
import java.util.ArrayList;
10-
import java.util.Collections;
11-
import java.util.Objects;
12-
import fr.softeam.cameldesigner.api.CamelDesignerProxyFactory;
13-
import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
14-
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
15-
import org.modelio.api.modelio.model.IModelingSession;
16-
import org.modelio.api.modelio.model.PropertyConverter;
179
import org.modelio.api.module.context.IModuleContext;
18-
import org.modelio.metamodel.mmextensions.infrastructure.ExtensionNotFoundException;
19-
import org.modelio.metamodel.uml.infrastructure.Dependency;
2010
import org.modelio.metamodel.uml.infrastructure.ModelElement;
2111
import org.modelio.metamodel.uml.infrastructure.Stereotype;
2212
import org.modelio.metamodel.uml.infrastructure.TagType;
23-
import org.modelio.metamodel.uml.infrastructure.properties.PropertyDefinition;
24-
import org.modelio.metamodel.uml.infrastructure.properties.PropertyTableDefinition;
25-
import org.modelio.vcore.smkernel.mapi.MObject;
13+
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
2614

2715
/**
2816
* Proxy class to handle a {@link ModelElement} with << CamelElement >> stereotype.
@@ -54,13 +42,21 @@ public boolean equals(final Object obj) {
5442

5543
/**
5644
* Get the underlying {@link ModelElement}.
57-
*
45+
*
5846
* @return the ModelElement represented by this proxy, never null.
5947
*/
6048
public ModelElement getElement() {
6149
return this.elt;
6250
}
6351

52+
public void setName(String name) {
53+
this.elt.setName(name);
54+
}
55+
56+
public String getName() {
57+
return this.elt.getName();
58+
}
59+
6460
@Override
6561
public int hashCode() {
6662
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());

‎src/main/java/fr/softeam/cameldesigner/api/camelcore/infrastructure/modelelement/Feature.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
*/
77
package fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement;
88

9-
import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
10-
import fr.softeam.cameldesigner.api.camelcore.standard.class_.FeatureClass;
11-
import fr.softeam.cameldesigner.api.camelcore.standard.instance.FeatureInstance;
12-
import fr.softeam.cameldesigner.api.camelcore.standard.port.FeaturePort;
13-
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
149
import org.modelio.api.module.context.IModuleContext;
1510
import org.modelio.metamodel.uml.infrastructure.ModelElement;
1611
import org.modelio.metamodel.uml.infrastructure.Stereotype;
1712
import org.modelio.metamodel.uml.infrastructure.TagType;
1813
import org.modelio.vcore.smkernel.mapi.MObject;
14+
import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
15+
import fr.softeam.cameldesigner.api.camelcore.standard.class_.FeatureClass;
16+
import fr.softeam.cameldesigner.api.camelcore.standard.instance.FeatureInstance;
17+
import fr.softeam.cameldesigner.api.camelcore.standard.port.FeaturePort;
18+
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
1919

2020
/**
2121
* Proxy class to handle a {@link ModelElement} with << Feature >> stereotype.
@@ -29,7 +29,7 @@ public abstract class Feature extends NamedElement {
2929
* Tells whether a {@link Feature proxy} can be instantiated from a {@link MObject} checking it is a {@link } stereotyped << Feature>>.
3030
* <p>
3131
* The method returns <code>false</code> if the instantiation cannot be carried out.
32-
*
32+
*
3333
* @param elt a model object
3434
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
3535
*/
@@ -44,7 +44,7 @@ public static boolean canInstantiate(final MObject elt) {
4444
* Tries to instantiate a {@link Feature} proxy from a {@link Class} stereotyped << Feature_Class >> checking its metaclass and its stereotype.
4545
* <p>
4646
* The method returns <i>null</i> if the instantiation cannot be carried out.
47-
*
47+
*
4848
* @param obj a Class
4949
* @return a {@link FeatureClass} proxy or <i>null</i>.
5050
*/
@@ -63,7 +63,7 @@ public static Feature instantiate(final ModelElement obj) {
6363
* Tries to instantiate a {@link Feature} proxy from a {@link Class} stereotyped << Feature_Class >> checking its metaclass and its stereotype.
6464
* <p>
6565
* The method returns <i>null</i> if the instantiation cannot be carried out.
66-
*
66+
*
6767
* @param obj a Class
6868
* @return a {@link FeatureClass} proxy or <i>null</i>.
6969
*/
@@ -95,7 +95,7 @@ public boolean equals(final Object obj) {
9595

9696
/**
9797
* Get the underlying {@link ModelElement}.
98-
*
98+
*
9999
* @return the ModelElement represented by this proxy, never null.
100100
*/
101101
@Override
@@ -126,11 +126,11 @@ public static void init(final IModuleContext ctx) {
126126
}
127127

128128

129-
static {
130-
if(CamelDesignerModule.getInstance() != null) {
131-
init(CamelDesignerModule.getInstance().getModuleContext());
129+
static {
130+
if(CamelDesignerModule.getInstance() != null) {
131+
init(CamelDesignerModule.getInstance().getModuleContext());
132+
}
132133
}
133134
}
134-
}
135135

136136
}

‎src/main/java/fr/softeam/cameldesigner/api/camelcore/infrastructure/modelelement/NamedElement.java‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
import java.util.Collections;
1111
import java.util.List;
1212
import java.util.Objects;
13+
import org.modelio.api.modelio.model.IModelingSession;
14+
import org.modelio.api.module.context.IModuleContext;
15+
import org.modelio.metamodel.uml.infrastructure.Dependency;
16+
import org.modelio.metamodel.uml.infrastructure.ModelElement;
17+
import org.modelio.metamodel.uml.infrastructure.Stereotype;
18+
import org.modelio.metamodel.uml.infrastructure.TagType;
1319
import fr.softeam.cameldesigner.api.CamelDesignerProxyFactory;
1420
import fr.softeam.cameldesigner.api.metadatamodel.infrastructure.modelelement.MmsObject;
1521
import fr.softeam.cameldesigner.api.metadatamodel.standard.attribute.MmsProperty;
1622
import fr.softeam.cameldesigner.api.metadatamodel.standard.attributelink.MmsPropertyInstance;
1723
import fr.softeam.cameldesigner.api.metadatamodel.standard.class_.MmsConcept;
1824
import fr.softeam.cameldesigner.api.metadatamodel.standard.instance.MmsConceptInstance;
1925
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
20-
import org.modelio.api.modelio.model.IModelingSession;
21-
import org.modelio.api.module.context.IModuleContext;
22-
import org.modelio.metamodel.uml.infrastructure.Dependency;
23-
import org.modelio.metamodel.uml.infrastructure.ModelElement;
24-
import org.modelio.metamodel.uml.infrastructure.Stereotype;
25-
import org.modelio.metamodel.uml.infrastructure.TagType;
2626

2727
/**
2828
* Proxy class to handle a {@link ModelElement} with << NamedElement >> stereotype.
@@ -49,7 +49,7 @@ public boolean equals(final Object obj) {
4949

5050
/**
5151
* Get the underlying {@link ModelElement}.
52-
*
52+
*
5353
* @return the ModelElement represented by this proxy, never null.
5454
*/
5555
@Override
@@ -87,20 +87,20 @@ public List<MmsObject> getAnnotations() {
8787
if ((d.isStereotyped(NamedElement.MdaTypes.MDAASSOCDEP)
8888
&& Objects.equals(d.getTagValue(NamedElement.MdaTypes.MDAASSOCDEP_ROLE), "annotations")
8989
&& d.getDependsOn().isStereotyped(MmsObject.MdaTypes.STEREOTYPE_ELT))) {
90-
90+
9191
ModelElement mObj = d.getDependsOn();
9292
if (MmsConceptInstance.canInstantiate(mObj))
9393
results.add((MmsConceptInstance)CamelDesignerProxyFactory.instantiate(mObj, MmsConceptInstance.STEREOTYPE_NAME));
94-
94+
9595
if (MmsConcept.canInstantiate(mObj))
9696
results.add((MmsConcept)CamelDesignerProxyFactory.instantiate(mObj, MmsConcept.STEREOTYPE_NAME));
97-
97+
9898
if (MmsProperty.canInstantiate(mObj))
9999
results.add((MmsProperty)CamelDesignerProxyFactory.instantiate(mObj, MmsProperty.STEREOTYPE_NAME));
100-
100+
101101
if (MmsPropertyInstance.canInstantiate(mObj))
102102
results.add((MmsPropertyInstance)CamelDesignerProxyFactory.instantiate(mObj, MmsPropertyInstance.STEREOTYPE_NAME));
103-
103+
104104
}
105105
}
106106
return Collections.unmodifiableList(results);
@@ -113,13 +113,13 @@ public List<MmsObject> getAnnotations() {
113113
*/
114114
public boolean removeAnnotations(final MmsObject obj) {
115115
if (obj != null) {
116-
for (Dependency d : new ArrayList<>(this.elt.getDependsOnDependency())) {
117-
if (d.isStereotyped(NamedElement.MdaTypes.MDAASSOCDEP) && Objects.equals(d.getTagValue(NamedElement.MdaTypes.MDAASSOCDEP_ROLE), ""))
118-
if (Objects.equals(d.getDependsOn(), obj.getElement())) {
119-
d.delete();
120-
return true;
121-
}
122-
}
116+
for (Dependency d : new ArrayList<>(this.elt.getDependsOnDependency())) {
117+
if (d.isStereotyped(NamedElement.MdaTypes.MDAASSOCDEP) && Objects.equals(d.getTagValue(NamedElement.MdaTypes.MDAASSOCDEP_ROLE), ""))
118+
if (Objects.equals(d.getDependsOn(), obj.getElement())) {
119+
d.delete();
120+
return true;
121+
}
122+
}
123123
}
124124
return false;
125125
}
@@ -128,6 +128,18 @@ protected NamedElement(final ModelElement elt) {
128128
super(elt);
129129
}
130130

131+
public void setName(String name) {
132+
this.elt.setName(name);
133+
}
134+
135+
public String getName() {
136+
return this.elt.getName();
137+
}
138+
139+
public void setDefaultName(String name) {
140+
CamelDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().getDefaultNameService().setDefaultName(this.elt, name);
141+
}
142+
131143
public static final class MdaTypes {
132144
public static Stereotype STEREOTYPE_ELT;
133145

@@ -142,11 +154,11 @@ public static void init(final IModuleContext ctx) {
142154
}
143155

144156

145-
static {
146-
if(CamelDesignerModule.getInstance() != null) {
147-
init(CamelDesignerModule.getInstance().getModuleContext());
157+
static {
158+
if(CamelDesignerModule.getInstance() != null) {
159+
init(CamelDesignerModule.getInstance().getModuleContext());
160+
}
148161
}
149162
}
150-
}
151163

152164
}

‎src/main/java/fr/softeam/cameldesigner/api/cameldiagrams/standard/classdiagram/AbstractCamelDiagram.java‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,25 @@
66
*/
77
package fr.softeam.cameldesigner.api.cameldiagrams.standard.classdiagram;
88

9-
import java.util.ArrayList;
10-
import java.util.Collections;
11-
import java.util.Objects;
12-
import fr.softeam.cameldesigner.api.CamelDesignerProxyFactory;
13-
import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
14-
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
15-
import org.modelio.api.modelio.model.IModelingSession;
16-
import org.modelio.api.modelio.model.PropertyConverter;
179
import org.modelio.api.module.context.IModuleContext;
1810
import org.modelio.metamodel.diagrams.ClassDiagram;
19-
import org.modelio.metamodel.mmextensions.infrastructure.ExtensionNotFoundException;
20-
import org.modelio.metamodel.uml.infrastructure.Dependency;
21-
import org.modelio.metamodel.uml.infrastructure.ModelElement;
2211
import org.modelio.metamodel.uml.infrastructure.Stereotype;
2312
import org.modelio.metamodel.uml.infrastructure.TagType;
24-
import org.modelio.metamodel.uml.infrastructure.properties.PropertyDefinition;
25-
import org.modelio.metamodel.uml.infrastructure.properties.PropertyTableDefinition;
26-
import org.modelio.vcore.smkernel.mapi.MObject;
13+
import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.NamedElement;
14+
import fr.softeam.cameldesigner.impl.CamelDesignerModule;
2715

2816
/**
2917
* Proxy class to handle a {@link ClassDiagram} with << AbstractCamelDiagram >> stereotype.
3018
* <p>Stereotype description:
3119
* <br/><i>null</i></p>
3220
*/
33-
public abstract class AbstractCamelDiagram {
21+
public abstract class AbstractCamelDiagram extends NamedElement{
3422
public static final String STEREOTYPE_NAME = "AbstractCamelDiagram";
3523

36-
/**
37-
* The underlying {@link ClassDiagram} represented by this proxy, never null.
38-
*/
39-
protected final ClassDiagram elt;
24+
// /**
25+
// * The underlying {@link ClassDiagram} represented by this proxy, never null.
26+
// */
27+
// protected final ClassDiagram elt;
4028

4129
@Override
4230
public boolean equals(final Object obj) {
@@ -55,11 +43,11 @@ public boolean equals(final Object obj) {
5543

5644
/**
5745
* Get the underlying {@link ClassDiagram}.
58-
*
46+
*
5947
* @return the ClassDiagram represented by this proxy, never null.
6048
*/
6149
public ClassDiagram getElement() {
62-
return this.elt;
50+
return (ClassDiagram) this.elt;
6351
}
6452

6553
@Override
@@ -68,7 +56,7 @@ public int hashCode() {
6856
}
6957

7058
protected AbstractCamelDiagram(final ClassDiagram elt) {
71-
this.elt = elt;
59+
super(elt);
7260
}
7361

7462
public static final class MdaTypes {
@@ -85,11 +73,11 @@ public static void init(final IModuleContext ctx) {
8573
}
8674

8775

88-
static {
89-
if(CamelDesignerModule.getInstance() != null) {
90-
init(CamelDesignerModule.getInstance().getModuleContext());
76+
static {
77+
if(CamelDesignerModule.getInstance() != null) {
78+
init(CamelDesignerModule.getInstance().getModuleContext());
79+
}
9180
}
9281
}
93-
}
9482

9583
}

0 commit comments

Comments
 (0)