diff options
author | Henrik Rentz-Reichert | 2013-03-06 18:20:32 +0000 |
---|---|---|
committer | Henrik Rentz-Reichert | 2013-03-07 08:05:08 +0000 |
commit | 259960ea1c6036cda0ac18e7fd4e441e4be3b9aa (patch) | |
tree | 5c9196161e701b2521582a1943f5faadeda168f3 | |
parent | a0c7b987e9def83b1260554e9d641814ccd770f7 (diff) | |
download | org.eclipse.etrice-259960ea1c6036cda0ac18e7fd4e441e4be3b9aa.tar.gz org.eclipse.etrice-259960ea1c6036cda0ac18e7fd4e441e4be3b9aa.tar.xz org.eclipse.etrice-259960ea1c6036cda0ac18e7fd4e441e4be3b9aa.zip |
[generator] using EcoreUtil2.resolveAll instead of EcoreUtil.resolveAll
this is aware of LazyLinkingResources
-rw-r--r-- | plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java index b76f18b5f..91b7e319c 100644 --- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java +++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/base/AbstractGenerator.java @@ -25,16 +25,16 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.etrice.core.genmodel.builder.GeneratorModelBuilder;
+import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
+import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
+import org.eclipse.etrice.core.genmodel.etricegen.Root;
import org.eclipse.etrice.core.room.DataClass;
import org.eclipse.etrice.core.room.DetailCode;
import org.eclipse.etrice.core.room.ProtocolClass;
import org.eclipse.etrice.core.room.RoomModel;
import org.eclipse.etrice.core.scoping.PlatformRelativeUriResolver;
-import org.eclipse.etrice.core.genmodel.builder.GeneratorModelBuilder;
-import org.eclipse.etrice.core.genmodel.etricegen.ExpandedActorClass;
-import org.eclipse.etrice.core.genmodel.etricegen.IDiagnostician;
-import org.eclipse.etrice.core.genmodel.etricegen.Root;
+import org.eclipse.xtext.EcoreUtil2;
import org.eclipse.xtext.diagnostics.Severity;
import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
import org.eclipse.xtext.util.CancelIndicator;
@@ -362,7 +362,9 @@ public abstract class AbstractGenerator implements IResourceURIAcceptor { modelURIs.remove(uri);
}
- EcoreUtil.resolveAll(resourceSet);
+ for (Resource res : resourceSet.getResources()) {
+ EcoreUtil2.resolveAll(res, CancelIndicator.NullImpl);
+ }
return ok;
}
|