Bumped up EMF version in pom-plain
diff --git a/examples/org.eclipse.epsilon.examples.standalone/src/org/eclipse/epsilon/examples/standalone/EpsilonStandaloneExample.java b/examples/org.eclipse.epsilon.examples.standalone/src/org/eclipse/epsilon/examples/standalone/EpsilonStandaloneExample.java
index 937a33b..3cfcdd3 100644
--- a/examples/org.eclipse.epsilon.examples.standalone/src/org/eclipse/epsilon/examples/standalone/EpsilonStandaloneExample.java
+++ b/examples/org.eclipse.epsilon.examples.standalone/src/org/eclipse/epsilon/examples/standalone/EpsilonStandaloneExample.java
@@ -18,6 +18,7 @@
import org.eclipse.epsilon.eol.IEolModule;
import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
import org.eclipse.epsilon.eol.exceptions.models.EolModelLoadingException;
+import org.eclipse.epsilon.eol.execute.context.IEolContext;
import org.eclipse.epsilon.eol.execute.context.Variable;
import org.eclipse.epsilon.eol.launch.EolRunConfiguration;
import org.eclipse.epsilon.eol.models.IModel;
@@ -50,27 +51,22 @@
module = createModule();
module.parse(getFileURI(getSource()));
- if (module.getParseProblems().size() > 0) {
+ Collection<?> parseProblems = module.getParseProblems();
+ if (!parseProblems.isEmpty()) {
System.err.println("Parse errors occured...");
- for (ParseProblem problem : module.getParseProblems()) {
- System.err.println(problem.toString());
- }
+ parseProblems.forEach(System.err::println);
return;
}
- for (IModel model : getModels()) {
- module.getContext().getModelRepository().addModel(model);
- }
-
- for (Variable parameter : parameters) {
- module.getContext().getFrameStack().put(parameter);
- }
+ IEolContext context = module.getContext();
+ context.getModelRepository().addModels(getModels());
+ context.getFrameStack().put(parameters);
preProcess();
result = execute(module);
postProcess();
- module.getContext().getModelRepository().dispose();
+ context.getModelRepository().dispose();
}
public Collection<Variable> getParameters() {
diff --git a/examples/org.eclipse.epsilon.examples.standalone/src/org/eclipse/epsilon/examples/standalone/eol/EolStandaloneMetamodelByUriExample.java b/examples/org.eclipse.epsilon.examples.standalone/src/org/eclipse/epsilon/examples/standalone/eol/EolStandaloneMetamodelByUriExample.java
index 766feb4..8673196 100644
--- a/examples/org.eclipse.epsilon.examples.standalone/src/org/eclipse/epsilon/examples/standalone/eol/EolStandaloneMetamodelByUriExample.java
+++ b/examples/org.eclipse.epsilon.examples.standalone/src/org/eclipse/epsilon/examples/standalone/eol/EolStandaloneMetamodelByUriExample.java
@@ -33,7 +33,7 @@
@Override
public List<IModel> getModels() throws Exception {
EmfUtil.register(URI.createURI(getFileURI("models/Tree.ecore").toString()), EPackage.Registry.INSTANCE);
- List<IModel> models = new ArrayList<IModel>();
+ List<IModel> models = new ArrayList<>(1);
models.add(createEmfModelByURI("Model", "models/Tree.xmi", "TreeDsl", true, true));
return models;
}
diff --git a/pom-plain.xml b/pom-plain.xml
index 102fae7..890fae9 100644
--- a/pom-plain.xml
+++ b/pom-plain.xml
@@ -521,12 +521,12 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
- <version>2.18.0</version>
+ <version>2.21.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore</artifactId>
- <version>2.21.0</version>
+ <version>2.23.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
