[unrelated] Clarify names of WrappedModelManager
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/BasicQVTiExecutor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/BasicQVTiExecutor.java
index 7ea569a..ee1966d 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/BasicQVTiExecutor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/BasicQVTiExecutor.java
@@ -26,6 +26,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
@@ -253,10 +254,9 @@
}
/**
- * WrappedModelManager enables the unhelpful model access API to be observed without infecting the
- * more streamlined QVTi accesses.
+ * Model2ModelsManager supports OCL's global single model domain accesses by redirecting to QVTi's multiple models manager..
*/
- private class WrappedModelManager extends AbstractModelManager implements ModelManager.ModelManagerExtension2
+ private class Model2ModelsManager extends AbstractModelManager implements ModelManager.ModelManagerExtension2
{
@Override
public @NonNull Set<@NonNull ? extends Object> get(org.eclipse.ocl.pivot.@NonNull Class type) {
@@ -281,7 +281,7 @@
protected final @NonNull QVTiModelsManager modelsManager;
private final @NonNull Map<@NonNull Mapping, @NonNull Interval> mapping2interval = new HashMap<>();
private @Nullable EObject transformationExecution = null;
- private @Nullable WrappedModelManager wrappedModelManager = null;
+ private @Nullable ModelManager model2ModelsManager = null;
private @Nullable Map<@NonNull Property, @Nullable Property> compileTimeProperty2runtimeProperty = null;
private @Nullable NewStatementOperation containedNewStatementOperation = null;
private @Nullable NewStatementOperation notContainedNewStatementOperation = null;
@@ -331,7 +331,8 @@
@Override
public void checkModels() throws CoreException {
StringBuilder s = null;
- for (@NonNull Resource resource : environmentFactory.getResourceSet().getResources()) {
+ ResourceSet resourceSet = environmentFactory.getResourceSet();
+ for (Resource resource : resourceSet.getResources()) {
String messages = PivotUtil.formatResourceDiagnostics(resource.getErrors(), "Errors in " + resource.getURI().toString(), "\n");
if (messages != null) {
if (s == null) {
@@ -499,12 +500,12 @@
}
@Override
- public @NonNull WrappedModelManager getModelManager() {
- WrappedModelManager wrappedModelManager2 = wrappedModelManager;
- if (wrappedModelManager2 == null) {
- wrappedModelManager2 = wrappedModelManager = new WrappedModelManager();
+ public @NonNull ModelManager getModelManager() {
+ ModelManager model2ModelsManager2 = model2ModelsManager;
+ if (model2ModelsManager2 == null) {
+ model2ModelsManager2 = model2ModelsManager = new Model2ModelsManager();
}
- return wrappedModelManager2;
+ return model2ModelsManager2;
}
@Override
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java
index fd8f133..2e7869c 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/evaluation/AbstractTransformationExecutor.java
@@ -41,10 +41,14 @@
* WrappedModelManager enables the unhelpful model access API to be observed without infecting the
* more streamlined QVTi accesses.
*/
- private class WrappedModelManager extends AbstractModelManager implements ModelManager.ModelManagerExtension2
+ /**
+ * Model2Model0Manager supports OCL's global single model domain accesses by redirecting to QVTi's models manager first model.
+ */
+ private class Model2Model0Manager extends AbstractModelManager implements ModelManager.ModelManagerExtension2
{
@Override
public @NonNull Set<@NonNull ? extends Object> get(org.eclipse.ocl.pivot.@NonNull Class type) {
+ // return transformer.getModelsManager().get(type);
return new IterableAsSet<@NonNull Object>(((AbstractTransformerInternal)transformer).get(type));
}
@@ -56,7 +60,7 @@
protected final @NonNull EnvironmentFactory environmentFactory;
protected final @NonNull Transformer transformer;
- private WrappedModelManager wrappedModelManager = null;
+ private ModelManager model2Model0Manager = null;
protected boolean suppressFailureDiagnosis = false;
private AbstractTransformationExecutor(@NonNull EnvironmentFactory environmentFactory, @NonNull Constructor<? extends Transformer> txConstructor)
@@ -126,12 +130,12 @@
}
@Override
- public @NonNull WrappedModelManager getModelManager() {
- WrappedModelManager wrappedModelManager2 = wrappedModelManager ;
- if (wrappedModelManager2 == null) {
- wrappedModelManager2 = wrappedModelManager = new WrappedModelManager();
+ public @NonNull ModelManager getModelManager() {
+ ModelManager model2Model0Manager2 = model2Model0Manager ;
+ if (model2Model0Manager2 == null) {
+ model2Model0Manager2 = model2Model0Manager = new Model2Model0Manager();
}
- return wrappedModelManager2;
+ return model2Model0Manager2;
}
@Override
diff --git a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java
index 99731d3..fd2fa6e 100644
--- a/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java
+++ b/plugins/org.eclipse.qvtd.runtime/src/org/eclipse/qvtd/runtime/internal/evaluation/AbstractTransformerInternal.java
@@ -229,7 +229,7 @@
/**
* Get the elements of type from the zeroth TypedModelInstance.
*
- * This obsolete method is used by some legacy tests that dispatch via allInstances()rtaher than Connections.
+ * This obsolete method is used by some legacy tests that dispatch via allInstances() rather than Connections.
*/
@Deprecated /* @deprecated Connections should be used to aggregate model elements */
public @NonNull Iterable<@NonNull Object> get(org.eclipse.ocl.pivot.@NonNull Class type) {
