Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@etiennebrosse
etiennebrosse committed Apr 27, 2022
1 parent 19f8602 commit b8211d8
Show file tree
Hide file tree
Showing 237 changed files with 8,776 additions and 8,491 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
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.09</version>
<version>1.0.10</version>
<name>CamelDesigner</name>
<repositories>
<repository>
Expand Down
26 changes: 0 additions & 26 deletions src/main/conf/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +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/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/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/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/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 @@ -2967,7 +2942,6 @@
</DiagramType>
<DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#ScalabilityModelDiagram">
<Palette keepBasePalette="false">
<ToolRef refid="ScalabilityModel" group="%group.Scalability.label"/>
<ToolRef refid="Scalability_Rule" group="%group.Scalability.label"/>
<ToolRef refid="Single_Event" group="%group.Scalability.label"/>
<ToolRef refid="Timer" group="%group.Scalability.label"/>
Expand Down
Binary file modified src/main/conf/res/generated/patterns/framework.umlt
View file
Binary file not shown.
569 changes: 295 additions & 274 deletions src/main/java/fr/softeam/cameldesigner/api/CamelDesignerProxyFactory.java
View file

Large diffs are not rendered by default.

55 changes: 26 additions & 29 deletions ...ain/java/fr/softeam/cameldesigner/api/camelcore/infrastructure/dependency/Annotation.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* WARNING: GENERATED FILE - DO NOT EDIT
* Module: CamelDesigner v1.0.09
* Module: CamelDesigner v1.0.10
* This file was generated on 4/20/22 10:37 AM by Modelio Studio.
* This file was generated on 4/27/22 11:51 AM by Modelio Studio.
*/
package fr.softeam.cameldesigner.api.camelcore.infrastructure.dependency;

Expand Down Expand Up @@ -34,7 +34,7 @@
*/
@objid ("7031d203-af8d-4031-b372-b418d6e60fbd")
public class Annotation extends CamelElement {
@objid ("aff4031f-29a2-406c-b17a-ba4d565b9e39")
@objid ("e22aa682-2067-4f7f-bd0a-d00354b6ba77")
public static final String STEREOTYPE_NAME = "Annotation";

/**
Expand All @@ -45,7 +45,7 @@ public class Annotation extends CamelElement {
* @param elt a model object
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
*/
@objid ("1a00e1d2-23bb-4746-9bfc-8e132d536e22")
@objid ("79940e57-0480-427d-abbf-916bc412504f")
public static boolean canInstantiate(final MObject elt) {
return ((elt instanceof Dependency) && ((Dependency) elt).isStereotyped(ICamelDesignerPeerModule.MODULE_NAME, Annotation.STEREOTYPE_NAME));
}
Expand All @@ -55,44 +55,42 @@ public static boolean canInstantiate(final MObject elt) {
*
* @return a {@link Annotation} proxy on the created {@link Dependency}.
*/
@objid ("9cca048c-aa6e-4854-b999-92d005c64931")
@objid ("651f4f79-af24-4d57-b4ad-4184c8dcc021")
public static Annotation create() {
ModelElement e = (ModelElement)CamelDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Infrastructure.Dependency");
e.addStereotype(ICamelDesignerPeerModule.MODULE_NAME, Annotation.STEREOTYPE_NAME);
return Annotation.instantiate((Dependency)e);
}

/**
* Tries to instantiate a {@link Annotation} proxy from a {@link Dependency} stereotyped << Annotation >> checking its metaclass and its stereotype.
* Tries to instantiate a {@link Annotation} proxy from a {@link Dependency} stereotyped << Annotation >> checking its metaclass and its stereotype.
* <p>
* The method returns <i>null</i> if the instantiation cannot be carried out.
*
* @param obj a Dependency
* @return a {@link Annotation} proxy or <i>null</i>.
*/
@objid ("750f4ce3-eb41-40ab-94f1-7e124cce0f1f")
@objid ("713a2323-276e-4714-a414-d1a0e0052bd3")
public static Annotation instantiate(final Dependency obj) {
return Annotation.canInstantiate(obj) ? new Annotation(obj) : null;
}

/**
* Tries to instantiate a {@link Annotation} proxy from a {@link Dependency} stereotyped << Annotation >> checking its metaclass and its stereotype.
* Tries to instantiate a {@link Annotation} proxy from a {@link Dependency} stereotyped << Annotation >> checking its metaclass and its stereotype.
* <p>
* The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out.
*
* @param obj a {@link Dependency}
* @return a {@link Annotation} proxy.
* @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out.
* @throws IllegalArgumentException if the instantiation cannot be carried out.
*/
@objid ("32e79ee2-cce3-4d4f-b30f-d42c23661202")
@objid ("daed0cb2-8cc9-47f8-8287-142c6e0631da")
public static Annotation safeInstantiate(final Dependency obj) throws IllegalArgumentException {
if (Annotation.canInstantiate(obj))
return new Annotation(obj);
return new Annotation(obj);
else
throw new IllegalArgumentException("Annotation: Cannot instantiate "+obj+": wrong element type or stereotype");
throw new IllegalArgumentException("Annotation: Cannot instantiate "+obj+": wrong element type or stereotype");
}

@objid ("1aa3767a-a8a2-4149-a823-9898898f623e")
@objid ("643eaa87-3286-4140-b323-5d3afa9c3326")
@Override
public boolean equals(final Object obj) {
if (this == obj) {
Expand All @@ -109,17 +107,16 @@ public boolean equals(final Object obj) {
}

/**
* Get the underlying {@link Dependency}.
*
* Get the underlying {@link Dependency}.
* @return the Dependency represented by this proxy, never null.
*/
@objid ("6f269a21-38bb-45d1-981c-69b3f4345401")
@objid ("f1cc67dd-10e7-4f6b-90a3-246d08281d66")
@Override
public Dependency getElement() {
return (Dependency)super.getElement();
}

@objid ("af6c20ea-9c0f-47f7-aa80-d84d812b271d")
@objid ("25ce878c-6638-4b62-a834-795fdfdfae5f")
@Override
public int hashCode() {
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
Expand All @@ -132,35 +129,35 @@ public List<CamelElement> getChilds() {
return result;
}

@objid ("fd259dd5-beeb-40d7-a229-ace2e681936c")
@objid ("3acea6f7-7546-4b39-aa7f-29c2350c3dc9")
protected Annotation(final Dependency elt) {
super(elt);
}

@objid ("e1806156-f5a9-4d39-9bb7-739c08fa2b43")
public static final class MdaTypes {
@objid ("c2f1f664-2731-4877-b85b-aafd506cafca")
@objid ("9dea96e2-cea0-4a40-bf30-ef05b627d0ab")
public static Stereotype STEREOTYPE_ELT;

@objid ("fecab6d1-a773-439a-a3aa-31c4723b42f4")
@objid ("8e1d1122-0119-4278-bb51-faaa1600b3da")
private static Stereotype MDAASSOCDEP;

@objid ("fc78da72-02b2-44d1-8fa4-92a6a88124e5")
@objid ("4dc15267-8091-4159-a2d8-2aa8353ca4a7")
private static TagType MDAASSOCDEP_ROLE;

@objid ("b7986d66-b1fd-495d-b65c-e0ed55961003")
@objid ("30b0ba29-8773-4717-8adf-4a27d17ecc2e")
public static void init(final IModuleContext ctx) {
STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "6ac7f831-f2b4-447b-ba9e-e58f7834bcf7");
MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e");
MDAASSOCDEP_ROLE = ctx.getModelingSession().findElementById(TagType.class, "7637f2fd-b750-43c1-a15c-5d0b084ca1cd");
}


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

}
55 changes: 26 additions & 29 deletions .../fr/softeam/cameldesigner/api/camelcore/infrastructure/dependency/PropertyDependency.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* WARNING: GENERATED FILE - DO NOT EDIT
* Module: CamelDesigner v1.0.09
* Module: CamelDesigner v1.0.10
* This file was generated on 4/20/22 10:37 AM by Modelio Studio.
* This file was generated on 4/27/22 11:51 AM by Modelio Studio.
*/
package fr.softeam.cameldesigner.api.camelcore.infrastructure.dependency;

Expand Down Expand Up @@ -34,7 +34,7 @@
*/
@objid ("66e1dd55-fc1a-4daa-b03e-a10778bf9f73")
public class PropertyDependency extends CamelElement {
@objid ("ae9fde68-da7c-4297-adf8-776df1594a62")
@objid ("b4c7b47c-8ce1-4d78-aad1-520fb7d38218")
public static final String STEREOTYPE_NAME = "PropertyDependency";

/**
Expand All @@ -45,7 +45,7 @@ public class PropertyDependency extends CamelElement {
* @param elt a model object
* @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
*/
@objid ("6691d50a-9c47-45a1-9d3c-c208b4852d94")
@objid ("12ec3ee5-7da7-408d-b6a4-3e39b6fc4d85")
public static boolean canInstantiate(final MObject elt) {
return ((elt instanceof Dependency) && ((Dependency) elt).isStereotyped(ICamelDesignerPeerModule.MODULE_NAME, PropertyDependency.STEREOTYPE_NAME));
}
Expand All @@ -55,44 +55,42 @@ public static boolean canInstantiate(final MObject elt) {
*
* @return a {@link PropertyDependency} proxy on the created {@link Dependency}.
*/
@objid ("42c2a61d-5ea5-4963-881e-657c77409b02")
@objid ("4e018fbc-ce30-47a1-8bf5-b1e29e8cc91e")
public static PropertyDependency create() {
ModelElement e = (ModelElement)CamelDesignerModule.getInstance().getModuleContext().getModelingSession().getModel().createElement("Infrastructure.Dependency");
e.addStereotype(ICamelDesignerPeerModule.MODULE_NAME, PropertyDependency.STEREOTYPE_NAME);
return PropertyDependency.instantiate((Dependency)e);
}

/**
* Tries to instantiate a {@link PropertyDependency} proxy from a {@link Dependency} stereotyped << PropertyDependency >> checking its metaclass and its stereotype.
* Tries to instantiate a {@link PropertyDependency} proxy from a {@link Dependency} stereotyped << PropertyDependency >> checking its metaclass and its stereotype.
* <p>
* The method returns <i>null</i> if the instantiation cannot be carried out.
*
* @param obj a Dependency
* @return a {@link PropertyDependency} proxy or <i>null</i>.
*/
@objid ("5440567b-9e10-4fa0-9d25-0fe6feccdfc1")
@objid ("775ee69c-52a2-4daf-9806-fcc7786642cf")
public static PropertyDependency instantiate(final Dependency obj) {
return PropertyDependency.canInstantiate(obj) ? new PropertyDependency(obj) : null;
}

/**
* Tries to instantiate a {@link PropertyDependency} proxy from a {@link Dependency} stereotyped << PropertyDependency >> checking its metaclass and its stereotype.
* Tries to instantiate a {@link PropertyDependency} proxy from a {@link Dependency} stereotyped << PropertyDependency >> checking its metaclass and its stereotype.
* <p>
* The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out.
*
* @param obj a {@link Dependency}
* @return a {@link PropertyDependency} proxy.
* @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out.
* @throws IllegalArgumentException if the instantiation cannot be carried out.
*/
@objid ("f203c824-44be-4d8e-9317-c859f9ea5182")
@objid ("f0686d3f-a07b-4196-8bfa-f84d4c56545d")
public static PropertyDependency safeInstantiate(final Dependency obj) throws IllegalArgumentException {
if (PropertyDependency.canInstantiate(obj))
return new PropertyDependency(obj);
return new PropertyDependency(obj);
else
throw new IllegalArgumentException("PropertyDependency: Cannot instantiate "+obj+": wrong element type or stereotype");
throw new IllegalArgumentException("PropertyDependency: Cannot instantiate "+obj+": wrong element type or stereotype");
}

@objid ("7db64d9c-7246-4b1c-924d-a034b32b3c35")
@objid ("6461dcd1-ce42-4574-8f35-97590fae78c1")
@Override
public boolean equals(final Object obj) {
if (this == obj) {
Expand All @@ -109,17 +107,16 @@ public boolean equals(final Object obj) {
}

/**
* Get the underlying {@link Dependency}.
*
* Get the underlying {@link Dependency}.
* @return the Dependency represented by this proxy, never null.
*/
@objid ("712eea4b-3756-4fd5-8207-3a6dce5f2b8f")
@objid ("80725605-334f-4011-8ca9-120185e22641")
@Override
public Dependency getElement() {
return (Dependency)super.getElement();
}

@objid ("d0fc82b1-e380-446c-857e-3dc52ba10970")
@objid ("cdab7378-7adb-41fc-b6f0-4b65b2225dfd")
@Override
public int hashCode() {
return 23 + ((this.elt == null) ? 0 : this.elt.hashCode());
Expand All @@ -132,35 +129,35 @@ public List<CamelElement> getChilds() {
return result;
}

@objid ("c4f32271-daee-4263-b05f-5520bedeb240")
@objid ("fa5016b2-2486-4858-9721-ad5351ec9989")
protected PropertyDependency(final Dependency elt) {
super(elt);
}

@objid ("ee885f54-f4e7-4fbc-9bb2-acd65bf59695")
public static final class MdaTypes {
@objid ("5a4ea156-1cd7-4e54-8ea3-472b184982e5")
@objid ("7354690d-f65a-448e-9aad-e30309a7a9c1")
public static Stereotype STEREOTYPE_ELT;

@objid ("506f714c-fcd2-4cf4-aa4b-f7d5578ac81c")
@objid ("ec2f9160-66a5-4dbd-82e1-d10e99e1c76e")
private static Stereotype MDAASSOCDEP;

@objid ("62eb7a39-75a5-4360-a59b-3f24ac9cfb2f")
@objid ("a9627e70-ad46-49ca-b173-4607950a9c30")
private static TagType MDAASSOCDEP_ROLE;

@objid ("dcc1f67d-6ad5-411a-affe-df2be8fff519")
@objid ("25784a74-98d4-45cc-a3cd-8800650fdd03")
public static void init(final IModuleContext ctx) {
STEREOTYPE_ELT = ctx.getModelingSession().findElementById(Stereotype.class, "738c4b6c-0cf3-4276-b6d9-7fe4ec31ff01");
MDAASSOCDEP = ctx.getModelingSession().findElementById(Stereotype.class, "94b7efa5-f94c-4d1d-896f-f103e56a8e2e");
MDAASSOCDEP_ROLE = ctx.getModelingSession().findElementById(TagType.class, "7637f2fd-b750-43c1-a15c-5d0b084ca1cd");
}


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

}
Loading

0 comments on commit b8211d8

Please sign in to comment.