Skip to content

Commit 19c7c35

Browse files
committed
Merge branch 'master' into model_execution_protocol
2 parents b09d42d + 3274665 commit 19c7c35

File tree

4 files changed

+5
-87
lines changed

4 files changed

+5
-87
lines changed

java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.metaprog/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.14.0",
1010
org.eclipse.emf.ecore,
1111
org.eclipse.core.resources,
1212
org.eclipse.jdt.core,
13-
org.eclipse.gemoc.xdsmlframework.api;bundle-version="4.0.0"
13+
org.eclipse.gemoc.xdsmlframework.api;bundle-version="4.0.0",
14+
org.eclipse.gemoc.xdsmlframework.extensions.kermeta3

java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.metaprog/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<extension
55
point="org.eclipse.gemoc.gemoc_language_workbench.metaprog">
66
<approach
7-
name="kermeta3"
7+
name="org.eclipse.gemoc.metaprog.kermeta3"
88
validator="org.eclipse.gemoc.execution.sequential.javaxdsml.ruleprovider.Kermeta3RuleProvider">
99
</approach>
1010
</extension>

java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.metaprog/src/org/eclipse/gemoc/execution/sequential/javaxdsml/ruleprovider/Kermeta3Rule.java

Lines changed: 0 additions & 84 deletions
This file was deleted.

java_xdsml/plugins/org.eclipse.gemoc.execution.sequential.javaxdsml.metaprog/src/org/eclipse/gemoc/execution/sequential/javaxdsml/ruleprovider/Kermeta3RuleProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.eclipse.gemoc.xdsmlframework.api.extensions.metaprog.IRule;
88
import org.eclipse.gemoc.xdsmlframework.api.extensions.metaprog.IRuleProvider;
99
import org.eclipse.gemoc.xdsmlframework.api.extensions.metaprog.EcoreRule;
10+
import org.eclipse.gemoc.xdsmlframework.extensions.kermeta3.Kermeta3Rule;
1011

1112

1213
/**
@@ -23,7 +24,7 @@ public class Kermeta3RuleProvider implements IRuleProvider {
2324
*/
2425
public Kermeta3RuleProvider() {
2526
ruleSet.add(new EcoreRule());
26-
ruleSet.add(new Kermeta3Rule());
27+
ruleSet.add(new Kermeta3Rule(true));
2728
}
2829

2930
@Override

0 commit comments

Comments
 (0)