diff options
| author | Ed Willink | 2019-05-21 07:40:04 +0000 |
|---|---|---|
| committer | Ed Willink | 2019-05-29 08:35:12 +0000 |
| commit | a511767ea1bb6738a68a229dfd4df856ea2bf7c6 (patch) | |
| tree | 575ccaea49151f7ac134adff340a4a2d0d9f9ef3 | |
| parent | acac3c471695baa47aef9fdc44acfcb6fdd4cbbd (diff) | |
| download | org.eclipse.qvtd-a511767ea1bb6738a68a229dfd4df856ea2bf7c6.tar.gz org.eclipse.qvtd-a511767ea1bb6738a68a229dfd4df856ea2bf7c6.tar.xz org.eclipse.qvtd-a511767ea1bb6738a68a229dfd4df856ea2bf7c6.zip | |
[515236] Ensure re-used Transformer names are qualified
2 files changed, 15 insertions, 1 deletions
diff --git a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCodeGenerator.java b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCodeGenerator.java index ab34f05f4..2f79a2612 100644 --- a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCodeGenerator.java +++ b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiCodeGenerator.java @@ -34,6 +34,7 @@ import org.eclipse.ocl.examples.codegen.java.CG2JavaPreVisitor; import org.eclipse.ocl.examples.codegen.java.ImportNameManager; import org.eclipse.ocl.examples.codegen.java.ImportUtils; import org.eclipse.ocl.examples.codegen.java.JavaCodeGenerator; +import org.eclipse.ocl.examples.codegen.java.JavaImportNameManager; import org.eclipse.ocl.examples.codegen.utilities.CGModelResourceFactory; import org.eclipse.ocl.examples.codegen.utilities.CGUtil; import org.eclipse.ocl.pivot.utilities.ClassUtil; @@ -175,6 +176,19 @@ public class QVTiCodeGenerator extends JavaCodeGenerator } @Override + public @NonNull ImportNameManager createImportNameManager() { + return new JavaImportNameManager() { + { // Ensure re-used inherited names are not confused + reserveImportName(org.eclipse.qvtd.runtime.evaluation.AbstractTransformer.class); + reserveImportName(org.eclipse.qvtd.runtime.evaluation.ExecutionVisitable.class); + reserveImportName(org.eclipse.qvtd.runtime.evaluation.Transformer.class); + reserveImportName(org.eclipse.qvtd.runtime.internal.evaluation.AbstractTransformerInternal.Incremental.class); + reserveImportName(org.eclipse.qvtd.runtime.internal.evaluation.AbstractTransformerInternal.Model.class); + } + }; + } + + @Override protected @NonNull NameManager createNameManager() { return new NameManager() { @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 598433462..262bb053c 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 @@ -468,7 +468,7 @@ public abstract class AbstractTransformerInternal /*extends AbstractModelManager } } - @Deprecated // only used by exe2016/bugmde2016 tests + @Deprecated // only used by exe2016/bigmde2016 tests private static class UnenforcedSetAccumulator extends SetValueImpl implements SetValue.Accumulator { public UnenforcedSetAccumulator(@NonNull CollectionTypeId typeId) { |