From ac2b856e6e71f595e943212f7619cc34c9698539 Mon Sep 17 00:00:00 2001 From: Sven Efftinge Date: Sun, 26 Feb 2017 15:50:48 +0100 Subject: [PATCH] [tracing] rename (#287) --- .../generator/trace/node/TracingSugarTest.xtend | 2 +- .../xtext/generator/trace/node/TracingSugarTest.java | 4 ++-- ...xtensionsForEMF.xtend => TracingExtensions.xtend} | 8 ++++---- ...gExtensionsForEMF.java => TracingExtensions.java} | 6 +++--- ...rocessor.java => TracingExtensionsProcessor.java} | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) rename org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/{TracingExtensionsForEMF.xtend => TracingExtensions.xtend} (94%) rename org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/{TracingExtensionsForEMF.java => TracingExtensions.java} (76%) rename org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/{TracingExtensionsForEMFProcessor.java => TracingExtensionsProcessor.java} (94%) diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/node/TracingSugarTest.xtend b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/node/TracingSugarTest.xtend index e10a6ea53..8a624395f 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/node/TracingSugarTest.xtend +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/node/TracingSugarTest.xtend @@ -29,7 +29,7 @@ import org.eclipse.xtext.generator.trace.ITraceRegionProvider @InjectWith(LazyLinkingTestLanguageInjectorProvider) class TracingSugarTest { - @TracingExtensionsForEMF(LazyLinkingFactory) + @TracingExtensions(LazyLinkingFactory) static class MyExtensions { /** diff --git a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingSugarTest.java b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingSugarTest.java index 586038155..5825bea81 100644 --- a/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingSugarTest.java +++ b/org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingSugarTest.java @@ -20,7 +20,7 @@ import org.eclipse.xtext.generator.trace.ITraceRegionProvider; import org.eclipse.xtext.generator.trace.node.CompositeGeneratorNode; import org.eclipse.xtext.generator.trace.node.IGeneratorNode; import org.eclipse.xtext.generator.trace.node.Traced; -import org.eclipse.xtext.generator.trace.node.TracingExtensionsForEMF; +import org.eclipse.xtext.generator.trace.node.TracingExtensions; import org.eclipse.xtext.generator.trace.node.TracingSugar; import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingFactory; import org.eclipse.xtext.linking.lazy.lazyLinking.Model; @@ -46,7 +46,7 @@ import org.junit.runner.RunWith; @InjectWith(LazyLinkingTestLanguageInjectorProvider.class) @SuppressWarnings("all") public class TracingSugarTest { - @TracingExtensionsForEMF(LazyLinkingFactory.class) + @TracingExtensions(LazyLinkingFactory.class) public static class MyExtensions extends TracingSugar { /** * manual implementation for unsupported multi cross reference diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMF.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TracingExtensions.xtend similarity index 94% rename from org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMF.xtend rename to org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TracingExtensions.xtend index e23f0686c..1c873c4bb 100644 --- a/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMF.xtend +++ b/org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TracingExtensions.xtend @@ -22,17 +22,17 @@ import org.eclipse.xtext.generator.trace.ILocationData /** * @author Sven Efftinge - Initial contribution and API */ -@Active(TracingExtensionsForEMFProcessor) -annotation TracingExtensionsForEMF { +@Active(TracingExtensionsProcessor) +annotation TracingExtensions { Class[] value } -class TracingExtensionsForEMFProcessor extends AbstractClassProcessor { +class TracingExtensionsProcessor extends AbstractClassProcessor { override doTransform(MutableClassDeclaration annotatedClass, extension TransformationContext context) { val eobjectType = EObject.newTypeReference() annotatedClass.extendedClass = TracingSugar.newTypeReference() - val annotationType = findTypeGlobally(TracingExtensionsForEMF) + val annotationType = findTypeGlobally(TracingExtensions) val factories = annotatedClass.findAnnotation(annotationType)?.getClassArrayValue("value") if (factories === null) { return; diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMF.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensions.java similarity index 76% rename from org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMF.java rename to org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensions.java index 7d6e64fbb..4856ec5d4 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMF.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensions.java @@ -9,12 +9,12 @@ package org.eclipse.xtext.generator.trace.node; import org.eclipse.emf.ecore.EFactory; import org.eclipse.xtend.lib.macro.Active; -import org.eclipse.xtext.generator.trace.node.TracingExtensionsForEMFProcessor; +import org.eclipse.xtext.generator.trace.node.TracingExtensionsProcessor; /** * @author Sven Efftinge - Initial contribution and API */ -@Active(TracingExtensionsForEMFProcessor.class) -public @interface TracingExtensionsForEMF { +@Active(TracingExtensionsProcessor.class) +public @interface TracingExtensions { public Class[] value(); } diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMFProcessor.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsProcessor.java similarity index 94% rename from org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMFProcessor.java rename to org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsProcessor.java index 463f20d71..4623c4ea9 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsForEMFProcessor.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TracingExtensionsProcessor.java @@ -28,7 +28,7 @@ import org.eclipse.xtend2.lib.StringConcatenationClient; import org.eclipse.xtext.generator.trace.ILocationData; import org.eclipse.xtext.generator.trace.node.CompositeGeneratorNode; import org.eclipse.xtext.generator.trace.node.IGeneratorNode; -import org.eclipse.xtext.generator.trace.node.TracingExtensionsForEMF; +import org.eclipse.xtext.generator.trace.node.TracingExtensions; import org.eclipse.xtext.generator.trace.node.TracingSugar; import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Conversions; @@ -40,12 +40,12 @@ import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; import org.eclipse.xtext.xbase.lib.StringExtensions; @SuppressWarnings("all") -public class TracingExtensionsForEMFProcessor extends AbstractClassProcessor { +public class TracingExtensionsProcessor extends AbstractClassProcessor { @Override public void doTransform(final MutableClassDeclaration annotatedClass, @Extension final TransformationContext context) { final TypeReference eobjectType = context.newTypeReference(EObject.class); annotatedClass.setExtendedClass(context.newTypeReference(TracingSugar.class)); - final Type annotationType = context.findTypeGlobally(TracingExtensionsForEMF.class); + final Type annotationType = context.findTypeGlobally(TracingExtensions.class); AnnotationReference _findAnnotation = annotatedClass.findAnnotation(annotationType); TypeReference[] _classArrayValue = null; if (_findAnnotation!=null) { @@ -75,7 +75,7 @@ public class TracingExtensionsForEMFProcessor extends AbstractClassProcessor { for (final ResolvedMethod getter : _filter_1) { { final TypeReference rt = getter.getResolvedReturnType(); - boolean _contains = TracingExtensionsForEMFProcessor.allowedLowerCaseTypeNames.contains(rt.getType().getSimpleName().toLowerCase()); + boolean _contains = TracingExtensionsProcessor.allowedLowerCaseTypeNames.contains(rt.getType().getSimpleName().toLowerCase()); if (_contains) { final Procedure1 _function_4 = (MutableMethodDeclaration it) -> { it.setReturnType(context.newTypeReference(IGeneratorNode.class)); @@ -85,7 +85,7 @@ public class TracingExtensionsForEMFProcessor extends AbstractClassProcessor { protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) { _builder.append(EStructuralFeature.class); _builder.append(" feature = target.eClass().getEStructuralFeature(\""); - String _featureName = TracingExtensionsForEMFProcessor.this.featureName(getter); + String _featureName = TracingExtensionsProcessor.this.featureName(getter); _builder.append(_featureName); _builder.append("\");"); _builder.newLineIfNotEmpty(); @@ -120,7 +120,7 @@ public class TracingExtensionsForEMFProcessor extends AbstractClassProcessor { protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) { _builder.append(EStructuralFeature.class); _builder.append(" feature = target.eClass().getEStructuralFeature(\""); - String _featureName = TracingExtensionsForEMFProcessor.this.featureName(getter); + String _featureName = TracingExtensionsProcessor.this.featureName(getter); _builder.append(_featureName); _builder.append("\");"); _builder.newLineIfNotEmpty();