Skip to content

Commit db4cb14

Browse files
Amina-MoussaouiAmina-Moussaoui
committed
Camel 3.0 extension + Export fixes
Camel 3.0 extensions fixes Type & Unit model export fixes
1 parent 70c93d3 commit db4cb14

37 files changed

Lines changed: 1009 additions & 188 deletions

‎pom.xml‎

Lines changed: 13 additions & 7 deletions
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.14</version>
8+
<version>1.0.15</version>
99
<name>CamelDesigner</name>
1010
<repositories>
1111
<repository>
@@ -307,12 +307,6 @@
307307
<type>jar</type>
308308
</dependency>
309309

310-
<dependency>
311-
<groupId>org.eclipse.xtext</groupId>
312-
<artifactId>CamelDSLExporter</artifactId>
313-
<version>3.0.0-SNAPSHOT</version>
314-
<type>jar</type>
315-
</dependency>
316310

317311
<dependency>
318312
<groupId>org.eclipse.core</groupId>
@@ -376,6 +370,18 @@
376370
<version>4.1.1</version>
377371
</dependency>
378372

373+
<dependency>
374+
<groupId>camel</groupId>
375+
<artifactId>camel</artifactId>
376+
<version>5.5.0-SNAPSHOT</version>
377+
</dependency>
378+
379+
<dependency>
380+
<groupId>camel</groupId>
381+
<artifactId>camel.dsl</artifactId>
382+
<version>5.5.0-SNAPSHOT</version>
383+
</dependency>
384+
379385
</dependencies>
380386

381387
<!-- // Build // -->

‎src/main/conf/module.xml‎

Lines changed: 122 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,126 @@
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"/>
10+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
11+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
12+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
13+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
14+
<PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
15+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
16+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
17+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
18+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
19+
<PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
20+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
21+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
22+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
23+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
24+
<PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
25+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
26+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
27+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
28+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
29+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
30+
<PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
31+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
32+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
33+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
34+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
35+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
36+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
37+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
38+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
39+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
40+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
41+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
42+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
43+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
44+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
45+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
46+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
47+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
48+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
49+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
50+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
51+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
52+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
53+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
54+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
55+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
56+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
57+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
58+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
59+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
60+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
61+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
62+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
63+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
64+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
65+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
66+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
67+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
68+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
69+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
70+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
71+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
72+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
73+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
74+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
75+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
76+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
77+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
78+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
79+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
80+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
81+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
82+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
83+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
84+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
85+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
86+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
87+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
88+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
89+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
90+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
91+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
92+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
93+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
94+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
95+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
96+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
97+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
98+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
99+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
100+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
101+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
102+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
103+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
104+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
105+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
106+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
107+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
108+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
109+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
110+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
111+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
112+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
113+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
114+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
115+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
116+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
117+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
118+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
119+
<PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
120+
<PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
121+
<PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
122+
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
123+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
124+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
5125
<PathEntry path="lib/inject-3.0.0.jar"/>
6126
<PathEntry path="lib/registry-3.7.0.jar"/>
7127
<PathEntry path="lib/xtext-2.12.0.jar"/>
@@ -42,7 +162,6 @@
42162
<PathEntry path="lib/essentialocl-1.3.0.jar"/>
43163
<PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
44164
<PathEntry path="lib/util-3.7.0.jar"/>
45-
<PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
46165
<PathEntry path="lib/contenttype-3.6.0.jar"/>
47166
<PathEntry path="lib/ocl-3.6.200.jar"/>
48167
<PathEntry path="lib/ecore-3.6.200.jar"/>
@@ -52,6 +171,8 @@
52171
<PathEntry path="lib/util-2.12.0.jar"/>
53172
<PathEntry path="lib/gson-2.8.9.jar"/>
54173
<PathEntry path="lib/MathParser.org-mXparser-4.1.1.jar"/>
174+
<PathEntry path="lib/camel-5.5.0-SNAPSHOT.jar"/>
175+
<PathEntry path="lib/camel.dsl-5.5.0-SNAPSHOT.jar"/>
55176
</ClassPath>
56177
<Profiles>
57178
<Profile uid="28a1b85d-93b2-47f7-845a-f4883b71ded5" id="CamelCore">

‎src/main/java/fr/softeam/cameldesigner/Main.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.nio.charset.StandardCharsets;
99
import java.util.Scanner;
1010
import com.modeliosoft.modelio.javadesigner.annotations.objid;
11-
1211
import fr.softeam.cameldesigner.profiler.data.Category;
1312
import fr.softeam.cameldesigner.profiler.data.ProvidingInfo;
1413

@@ -22,14 +21,14 @@ public class Main {
2221

2322
@objid ("d72fc10f-4888-49a1-be53-a504d109a8c2")
2423
public static void main(String[] args) {
25-
ProvidingInfo info = new ProvidingInfo();
26-
info.setComponentName("component-1");
27-
info.getCategories().add(Category.GPU);
28-
info.setLanguage("C");
29-
info.setRepository("https://github.com/jdtotow/tme");
30-
pushAnalyse(info);
31-
32-
getResponseAnalyse();
24+
ProvidingInfo info = new ProvidingInfo();
25+
info.setComponentName("component-1");
26+
info.getCategories().add(Category.GPU);
27+
info.setLanguage("C");
28+
info.setRepository("https://github.com/jdtotow/tme");
29+
pushAnalyse(info);
30+
31+
getResponseAnalyse();
3332
}
3433

3534
@objid ("4b02b658-c672-42c8-a7e5-b71d5e33e816")
@@ -179,7 +178,7 @@ public static void pushAnalyse(ProvidingInfo info) {
179178
@objid ("52969b0a-acaf-492c-8fb2-403cf7f9d89d")
180179
public static void getResponseAnalyse() {
181180
try {
182-
System.out.println("collection of data");
181+
System.out.println("collection of data");
183182
URL url = new URL(_URL + "/collect?code=" + code );
184183

185184
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -192,7 +191,7 @@ public static void getResponseAnalyse() {
192191
if (responsecode != 200) {
193192
throw new RuntimeException("HttpResponseCode: " + responsecode);
194193
} else {
195-
194+
196195
String inline = "";
197196
Scanner scanner = new Scanner(url.openStream());
198197

‎src/main/java/fr/softeam/cameldesigner/api/typemodel/standard/class_/Limit.java‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,10 @@ public static Limit create() {
7474
}
7575

7676
/**
77-
* Tries to instantiate a {@link Limit} proxy from a {@link Class} stereotyped << Limit >> checking its metaclass and its stereotype.
77+
* Tries to instantiate a {@link Limit} proxy from a {@link Class} stereotyped << Limit >> checking its metaclass and its stereotype.
7878
* <p>
7979
* The method returns <i>null</i> if the instantiation cannot be carried out.
80+
*
8081
* @param obj a Class
8182
* @return a {@link Limit} proxy or <i>null</i>.
8283
*/
@@ -86,19 +87,20 @@ public static Limit instantiate(final Class obj) {
8687
}
8788

8889
/**
89-
* Tries to instantiate a {@link Limit} proxy from a {@link Class} stereotyped << Limit >> checking its metaclass and its stereotype.
90+
* Tries to instantiate a {@link Limit} proxy from a {@link Class} stereotyped << Limit >> checking its metaclass and its stereotype.
9091
* <p>
9192
* The method throws an {@link IllegalArgumentException} if the instantiation cannot be carried out.
93+
*
9294
* @param obj a {@link Class}
9395
* @return a {@link Limit} proxy.
94-
* @throws IllegalArgumentException if the instantiation cannot be carried out.
96+
* @throws java.lang.IllegalArgumentException if the instantiation cannot be carried out.
9597
*/
9698
@objid ("de4ca448-be4c-4440-a478-f0e3d1fe5dd5")
9799
public static Limit safeInstantiate(final Class obj) throws IllegalArgumentException {
98100
if (Limit.canInstantiate(obj))
99-
return new Limit(obj);
101+
return new Limit(obj);
100102
else
101-
throw new IllegalArgumentException("Limit: Cannot instantiate "+obj+": wrong element type or stereotype");
103+
throw new IllegalArgumentException("Limit: Cannot instantiate "+obj+": wrong element type or stereotype");
102104
}
103105

104106
@objid ("2155859d-62dd-4592-8639-8087088df8c8")
@@ -118,7 +120,8 @@ public boolean equals(final Object obj) {
118120
}
119121

120122
/**
121-
* Get the underlying {@link Class}.
123+
* Get the underlying {@link Class}.
124+
*
122125
* @return the Class represented by this proxy, never null.
123126
*/
124127
@objid ("2e4b3947-dcfb-469c-96c0-45ec7a86ca59")
@@ -207,11 +210,11 @@ public static void init(final IModuleContext ctx) {
207210
}
208211

209212

210-
static {
211-
if(CamelDesignerModule.getInstance() != null) {
212-
init(CamelDesignerModule.getInstance().getModuleContext());
213-
}
214-
}
213+
static {
214+
if(CamelDesignerModule.getInstance() != null) {
215+
init(CamelDesignerModule.getInstance().getModuleContext());
216+
}
217+
}
215218
}
216219

217220
}

0 commit comments

Comments
 (0)