diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.xtend index 99330f5c843..6d79c57c951 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.xtend @@ -30,7 +30,7 @@ class CompilerBug423631Test extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -42,7 +42,7 @@ class CompilerBug423631Test extends AbstractXtendCompilerTest { return null; } - @Generated + @XbaseGenerated public Object m(final A a) { if (a instanceof B) { return _m((B)a); diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.xtend index 5eb6111ea9e..6a742bf3ebd 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.xtend @@ -1132,7 +1132,7 @@ class CompilerBug427637Test extends AbstractXtendCompilerTest { import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Extension; import org.eclipse.xtext.xbase.lib.Functions.Function1; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.IterableExtensions; import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; import org.eclipse.xtext.xbase.lib.util.ToStringHelper; @@ -1653,7 +1653,7 @@ class CompilerBug427637Test extends AbstractXtendCompilerTest { return _function; } - @Generated + @XbaseGenerated protected Function1> newFormattingData(final HiddenLeafs leafs, final PreferenceKey key, final FormattingDataFactory.FormattingDataInit it) { if (key instanceof BlankLineKey) { return _newFormattingData(leafs, (BlankLineKey)key, it); diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.xtend index 325c40a6358..bf389a6d945 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.xtend @@ -39,7 +39,7 @@ class CompilerBug441096Test extends AbstractXtendCompilerTest { import java.util.Arrays; import org.eclipse.xtend.lib.annotations.AccessorType; import org.eclipse.xtend.lib.annotations.Accessors; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.Pure; @SuppressWarnings("all") @@ -65,7 +65,7 @@ class CompilerBug441096Test extends AbstractXtendCompilerTest { } }; - @Generated + @XbaseGenerated public void m(final Object expr, final Object seq) { if (expr == null && seq instanceof StringBuilder) { diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.xtend index 21f21637457..7f2f298867a 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.xtend @@ -36,7 +36,7 @@ class CompilerBug441099Test extends AbstractXtendCompilerTest { ''', ''' import org.eclipse.xtend.lib.annotations.AccessorType; import org.eclipse.xtend.lib.annotations.Accessors; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.Pure; @SuppressWarnings("all") @@ -52,7 +52,7 @@ class CompilerBug441099Test extends AbstractXtendCompilerTest { return new D(""); } - @Generated + @XbaseGenerated public Object m(final String x) { return _m(x); } diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.xtend index 3c6b97262bd..18e590438ab 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.xtend @@ -36,7 +36,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest { import java.util.Iterator; import java.util.List; import org.eclipse.xtext.xbase.lib.CollectionLiterals; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.IterableExtensions; @SuppressWarnings("all") @@ -58,7 +58,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest { return CollectionLiterals.emptyList(); } - @Generated + @XbaseGenerated public List getList(final Object it) { if (it instanceof SOE.A) { return _getList((SOE.A)it); @@ -93,7 +93,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest { import java.util.Iterator; import java.util.List; import org.eclipse.xtext.xbase.lib.CollectionLiterals; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.IterableExtensions; @SuppressWarnings("all") @@ -112,7 +112,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest { return CollectionLiterals.emptyList(); } - @Generated + @XbaseGenerated public List getList(final Object it) { if (it instanceof C) { return _getList((C)it); @@ -149,7 +149,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest { import java.util.Iterator; import java.util.List; import org.eclipse.xtext.xbase.lib.CollectionLiterals; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.IterableExtensions; @SuppressWarnings("all") @@ -171,7 +171,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest { return IterableExtensions.toList(new SOE.CustomItr()); } - @Generated + @XbaseGenerated public List getList(final Object it) { if (it instanceof SOE.A) { return _getList((SOE.A)it); @@ -207,7 +207,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest { import java.util.Iterator; import java.util.List; import org.eclipse.xtext.xbase.lib.CollectionLiterals; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.IterableExtensions; @SuppressWarnings("all") @@ -229,7 +229,7 @@ class CompilerBug470768Test extends AbstractXtendCompilerTest { return CollectionLiterals.emptyList(); } - @Generated + @XbaseGenerated public List getList(final Object it) { if (it instanceof SOE.A) { return _getList((SOE.A)it); diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.xtend index afa045d6dc5..69757a66c0f 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.xtend @@ -38,7 +38,7 @@ class CompilerBugDispatchWithOverrideTest extends AbstractXtendCompilerTest { ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Something extends AbstractSomething { @@ -47,7 +47,7 @@ class CompilerBugDispatchWithOverrideTest extends AbstractXtendCompilerTest { } @Override - @Generated + @XbaseGenerated public void m(final Object x) { if (x instanceof Integer) { _m((Integer)x); @@ -82,14 +82,14 @@ class CompilerBugDispatchWithOverrideTest extends AbstractXtendCompilerTest { ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Something extends AbstractSomething { protected void _m(final String x) { } - @Generated + @XbaseGenerated public void m(final Object x) { if (x instanceof Integer) { _m((Integer)x); diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.xtend index d362835c365..4e53b4ed89a 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.xtend @@ -32,7 +32,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class D extends C { @@ -42,7 +42,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest { protected void _m(final CharSequence o) { } - @Generated + @XbaseGenerated public void m(final Object o) { if (o instanceof Integer) { _m((Integer)o); @@ -95,7 +95,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Parent { @@ -107,7 +107,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest { return this.test(a.getDann()); } - @Generated + @XbaseGenerated public T test(final Ausdruck a) { if (a instanceof Fallunterscheidung) { return _test((Fallunterscheidung)a); @@ -149,7 +149,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Child extends Parent { @@ -157,7 +157,7 @@ class CompilerBugInheritedDispatchTest extends AbstractXtendCompilerTest { return null; } - @Generated + @XbaseGenerated public String test(final Ausdruck a) { if (a instanceof Fallunterscheidung) { return _test((Fallunterscheidung)a); diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.xtend index d2f367116c5..f6f0768ae4c 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.xtend @@ -680,7 +680,7 @@ class CompilerTraceTest extends AbstractXtendTestCase { } '''.tracesTo(''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Zonk { @@ -690,7 +690,7 @@ class CompilerTraceTest extends AbstractXtendTestCase { protected void _method(final Integer i) { } - @Generated + @XbaseGenerated public void method(final Object i) { if (i instanceof Integer) { _method((Integer)i); @@ -716,7 +716,7 @@ class CompilerTraceTest extends AbstractXtendTestCase { } '''.tracesTo(''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Zonk { @@ -726,7 +726,7 @@ class CompilerTraceTest extends AbstractXtendTestCase { protected void _method(final Integer i) { } - @Generated + @XbaseGenerated public void #method#(final Object i) { if (i instanceof Integer) { _method((Integer)i); @@ -752,7 +752,7 @@ class CompilerTraceTest extends AbstractXtendTestCase { } '''.tracesTo(''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Zonk { @@ -762,7 +762,7 @@ class CompilerTraceTest extends AbstractXtendTestCase { protected void _method(final Integer i) { } - @Generated + @XbaseGenerated public void method(final Object i) { if (i instanceof Integer) { _method((Integer)i); diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/DispatchCompilerTest.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/DispatchCompilerTest.xtend index 369abe408b8..9011e41f482 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/DispatchCompilerTest.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/DispatchCompilerTest.xtend @@ -36,7 +36,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''',''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Foo { @@ -56,7 +56,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return null; } - @Generated + @XbaseGenerated public Object foo(final Object assert_) { if (assert_ instanceof String) { return _foo((String)assert_); @@ -68,7 +68,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } } - @Generated + @XbaseGenerated public Object bar(final Object assert_, final String assert__1) { if (assert_ instanceof String) { return _bar((String)assert_, assert__1); @@ -96,7 +96,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import org.eclipse.xtext.xbase.lib.Extension; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -104,7 +104,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return s.substring(4); } - @Generated + @XbaseGenerated public String m(final String s) { return _m(s); } @@ -121,7 +121,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } } ''', ''' - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -129,7 +129,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { throw new RuntimeException(); } - @Generated + @XbaseGenerated public void minus(final Object operand) { _minus(operand); return; @@ -147,7 +147,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } } ''', ''' - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -155,7 +155,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { throw new RuntimeException(); } - @Generated + @XbaseGenerated public int minus(final Object operand) { return _minus(operand); } @@ -178,7 +178,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { ''', ''' import java.util.Arrays; import org.eclipse.xtext.xbase.lib.DoubleExtensions; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -197,7 +197,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return DoubleExtensions.operator_minus(e); } - @Generated + @XbaseGenerated public double minus(final Object e) { if (e instanceof Double) { return _minus((Double)e); @@ -230,7 +230,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -246,7 +246,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { throw new RuntimeException(); } - @Generated + @XbaseGenerated public void minus(final Object e) { if (e instanceof Double) { _minus((Double)e); @@ -280,7 +280,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { import java.util.Arrays; import org.eclipse.xtext.xbase.lib.DoubleExtensions; import org.eclipse.xtext.xbase.lib.Exceptions; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -301,7 +301,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return Double.valueOf(DoubleExtensions.operator_minus(e)); } - @Generated + @XbaseGenerated public Number minus(final Object e) { if (e instanceof Double) { return _minus((Double)e); @@ -332,7 +332,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { import java.util.Arrays; import org.eclipse.xtext.xbase.lib.DoubleExtensions; import org.eclipse.xtext.xbase.lib.Exceptions; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -353,7 +353,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return Double.valueOf(DoubleExtensions.operator_minus(e)); } - @Generated + @XbaseGenerated public Number minus(final Object e) { if (e instanceof Double) { return _minus((Double)e); @@ -383,7 +383,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -395,7 +395,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return null; } - @Generated + @XbaseGenerated public Object m(final Object sb, final int x) { if (sb instanceof StringBuffer) { return _m((StringBuffer)sb, x); @@ -432,7 +432,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -452,7 +452,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return null; } - @Generated + @XbaseGenerated public Object m(final Number x) { if (x instanceof Double) { return _m((Double)x); @@ -490,7 +490,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -506,7 +506,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return null; } - @Generated + @XbaseGenerated public Object m(final Object x) { if (x instanceof Integer) { return _m((Integer)x); @@ -531,7 +531,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { def dispatch void doThing(Object o) {} } ''', ''' - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Test { @@ -541,7 +541,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { protected void _doThing(final Object o) { } - @Generated + @XbaseGenerated public void doThing(final Object v) { if (v == null) { _doThing((Void)null); @@ -563,7 +563,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { def dispatch void doThing(String o) {} } ''', ''' - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Test { @@ -573,7 +573,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { protected void _doThing(final String o) { } - @Generated + @XbaseGenerated public void doThing(final String o) { if (o != null) { _doThing(o); @@ -595,7 +595,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { def dispatch void doThing(Object p0, Void p1) {} } ''', ''' - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Test { @@ -605,7 +605,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { protected void _doThing(final Object p0, final Void p1) { } - @Generated + @XbaseGenerated public void doThing(final Object p0, final Object p1) { if (p0 == null && p1 != null) { @@ -630,7 +630,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Test { @@ -646,7 +646,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { return ""; } - @Generated + @XbaseGenerated public String toExpectation(final Object p1) { if (p1 instanceof Integer) { return _toExpectation((Integer)p1); @@ -672,7 +672,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Test { @@ -682,7 +682,7 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { protected void _doThing(final Object p0, final Integer p1) { } - @Generated + @XbaseGenerated public void doThing(final Object p0, final Number p1) { if (p0 == null && p1 instanceof Float) { @@ -708,14 +708,14 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { def dispatch void doThing(Object p0, Integer p1) {} } ''', ''' - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Test { protected void _doThing(final Object p0, final Integer p1) { } - @Generated + @XbaseGenerated public void doThing(final Object p0, final Integer p1) { _doThing(p0, p1); return; @@ -732,14 +732,14 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Test { protected void _doThing(final Void p0, final Integer p1) { } - @Generated + @XbaseGenerated public void doThing(final Object p0, final Integer p1) { if (p0 == null) { _doThing((Void)null, p1); @@ -761,14 +761,14 @@ class DispatchCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Test { protected void _doThing(final Void p0, final Void p1) { } - @Generated + @XbaseGenerated public void doThing(final Object p0, final Object p1) { if (p0 == null && p1 == null) { diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.xtend index dc816f586ef..b9fb45a5b3f 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.xtend @@ -389,7 +389,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -401,7 +401,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { return s.length(); } - @Generated + @XbaseGenerated public int testFunction1(final CharSequence s) { if (s instanceof String) { return _testFunction1((String)s); @@ -437,7 +437,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -449,7 +449,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { return i.intValue(); } - @Generated + @XbaseGenerated public int testFunction1(final Object i) { if (i instanceof Integer) { return _testFunction1((Integer)i); @@ -482,7 +482,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class D extends C { @@ -490,7 +490,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { return d.intValue(); } - @Generated + @XbaseGenerated public int testFunction1(final Object d) { if (d instanceof Double) { return _testFunction1((Double)d); @@ -528,7 +528,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class D extends C { @@ -540,7 +540,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { return n.intValue(); } - @Generated + @XbaseGenerated public int testFunction1(final Object d) { if (d instanceof Double) { return _testFunction1((Double)d); @@ -580,7 +580,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { } ''', ''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class C { @@ -592,7 +592,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { return i.intValue(); } - @Generated + @XbaseGenerated public int testFunction1(final Object i) { if (i instanceof Integer) { return _testFunction1((Integer)i); @@ -3170,7 +3170,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { package foo; import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class NoSuchElementException { @@ -3180,7 +3180,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { protected void _foo(final Object s) { } - @Generated + @XbaseGenerated public void foo(final Object s) { if (s instanceof String) { _foo((String)s); @@ -3210,7 +3210,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { package foo; import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class MyType { @@ -3223,7 +3223,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { protected void _foo(final Object s, final Object other) { } - @Generated + @XbaseGenerated public void foo(final Object s, final Object other) { if (s instanceof String && other instanceof CharSequence) { @@ -3259,7 +3259,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { package foo; import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class MyType { @@ -3272,7 +3272,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { protected void _foo(final String s, final CharSequence other) { } - @Generated + @XbaseGenerated public void foo(final Object s, final Object other) { if (s instanceof String && other instanceof CharSequence) { @@ -3307,7 +3307,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { package foo; import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class MyType { @@ -3317,7 +3317,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { protected void _foo(final StringBuffer s, final boolean b, final String other) { } - @Generated + @XbaseGenerated public void foo(final Object s, final boolean b, final String other) { if (s instanceof StringBuffer) { _foo((StringBuffer)s, b, other); @@ -5369,7 +5369,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { class B implements Element {} '''.assertCompilesTo(''' import java.util.Arrays; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class Bug { @@ -5381,7 +5381,7 @@ class XtendCompilerTest extends AbstractXtendCompilerTest { return 1; } - @Generated + @XbaseGenerated public int bug(final Element a) { if (a instanceof A) { return _bug((A)a); diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/java8/compiler/CompilerBug427637Test.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/java8/compiler/CompilerBug427637Test.xtend index d44f238afb3..c56064340fb 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/java8/compiler/CompilerBug427637Test.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/java8/compiler/CompilerBug427637Test.xtend @@ -1086,7 +1086,7 @@ class CompilerBug427637Test extends org.eclipse.xtend.core.tests.compiler.Compil import org.eclipse.xtext.xbase.lib.CollectionLiterals; import org.eclipse.xtext.xbase.lib.Extension; import org.eclipse.xtext.xbase.lib.Functions.Function1; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.IterableExtensions; import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; import org.eclipse.xtext.xbase.lib.util.ToStringHelper; @@ -1594,7 +1594,7 @@ class CompilerBug427637Test extends org.eclipse.xtend.core.tests.compiler.Compil return _function; } - @Generated + @XbaseGenerated protected Function1> newFormattingData(final HiddenLeafs leafs, final PreferenceKey key, final FormattingDataFactory.FormattingDataInit it) { if (key instanceof BlankLineKey) { return _newFormattingData(leafs, (BlankLineKey)key, it); diff --git a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/macro/AbstractReusableActiveAnnotationTests.xtend b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/macro/AbstractReusableActiveAnnotationTests.xtend index 23191b5c5e8..f2f0989d17f 100644 --- a/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/macro/AbstractReusableActiveAnnotationTests.xtend +++ b/org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/macro/AbstractReusableActiveAnnotationTests.xtend @@ -1749,7 +1749,7 @@ abstract class AbstractReusableActiveAnnotationTests { import java.util.Arrays; import myannotation.AddDispatchCase; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @AddDispatchCase @SuppressWarnings("all") @@ -1758,7 +1758,7 @@ abstract class AbstractReusableActiveAnnotationTests { return null; } - @Generated + @XbaseGenerated public String m(final Object i) { if (i instanceof Integer) { return _m((Integer)i); @@ -1858,14 +1858,14 @@ abstract class AbstractReusableActiveAnnotationTests { package myusercode; import myannotation.Base; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class D1 { protected void _m(final Base b) { } - @Generated + @XbaseGenerated public void m(final Base b) { _m(b); return; @@ -1877,7 +1877,7 @@ abstract class AbstractReusableActiveAnnotationTests { import java.util.Arrays; import myannotation.Base; - import org.eclipse.xtext.xbase.lib.Generated; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class D2 extends D1 { @@ -1890,7 +1890,7 @@ abstract class AbstractReusableActiveAnnotationTests { protected void _m(final Derived3 d) { } - @Generated + @XbaseGenerated public void m(final Base d) { if (d instanceof Derived1) { _m((Derived1)d); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.java index 54ae79a3375..5149e01f707 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug423631Test.java @@ -46,7 +46,7 @@ public void testBug423631_01() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -74,7 +74,7 @@ public void testBug423631_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Object m(final A a) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.java index 9e97d7668fc..8ba8957ddd7 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug427637Test.java @@ -2681,7 +2681,7 @@ public void testBug_427637_15() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.Functions.Function1;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.IterableExtensions;"); _builder_1.newLine(); @@ -4185,7 +4185,7 @@ public void testBug_427637_15() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("protected Function1> newFormattingData(final HiddenLeafs leafs, final PreferenceKey key, final FormattingDataFactory.FormattingDataInit it) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.java index 667530f553e..ae413962067 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug441096Test.java @@ -74,7 +74,7 @@ public void test_01() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtend.lib.annotations.Accessors;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.Pure;"); _builder_1.newLine(); @@ -135,7 +135,7 @@ public void test_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void m(final Object expr, final Object seq) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.java index 95dff26e03b..e08fd74c68f 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug441099Test.java @@ -62,7 +62,7 @@ public void test_01() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtend.lib.annotations.Accessors;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.Pure;"); _builder_1.newLine(); @@ -99,7 +99,7 @@ public void test_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Object m(final String x) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.java index 60e0455b2b9..75be287b91b 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBug470768Test.java @@ -68,7 +68,7 @@ public void test_01() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.CollectionLiterals;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.IterableExtensions;"); _builder_1.newLine(); @@ -121,7 +121,7 @@ public void test_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public List getList(final Object it) {"); @@ -207,7 +207,7 @@ public void test_02() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.CollectionLiterals;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.IterableExtensions;"); _builder_1.newLine(); @@ -253,7 +253,7 @@ public void test_02() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public List getList(final Object it) {"); @@ -344,7 +344,7 @@ public void test_03() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.CollectionLiterals;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.IterableExtensions;"); _builder_1.newLine(); @@ -397,7 +397,7 @@ public void test_03() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public List getList(final Object it) {"); @@ -486,7 +486,7 @@ public void test_04() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.CollectionLiterals;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.IterableExtensions;"); _builder_1.newLine(); @@ -539,7 +539,7 @@ public void test_04() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public List getList(final Object it) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.java index a0d49a5397f..fe77a655f69 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBugDispatchWithOverrideTest.java @@ -49,7 +49,7 @@ public void testDispatchWithOverrideJava6HasAnnotation() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -70,7 +70,7 @@ public void testDispatchWithOverrideJava6HasAnnotation() { _builder_1.append("@Override"); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void m(final Object x) {"); @@ -139,7 +139,7 @@ public void testDispatchWithOverrideJava5HasNoAnnotation() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -154,7 +154,7 @@ public void testDispatchWithOverrideJava5HasNoAnnotation() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void m(final Object x) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.java index 30af12dd8fa..33786bf0e1e 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerBugInheritedDispatchTest.java @@ -53,7 +53,7 @@ public void test_01() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -75,7 +75,7 @@ public void test_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void m(final Object o) {"); @@ -210,7 +210,7 @@ public void test_383430_02() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -238,7 +238,7 @@ public void test_383430_02() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public T test(final Ausdruck a) {"); @@ -340,7 +340,7 @@ public void test_383430_03() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -358,7 +358,7 @@ public void test_383430_03() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public String test(final Ausdruck a) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.java index 4fab4bc6816..5b260206372 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/CompilerTraceTest.java @@ -1333,7 +1333,7 @@ public void testDispatchMethodName_01() throws Exception { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1355,7 +1355,7 @@ public void testDispatchMethodName_01() throws Exception { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void method(final Object i) {"); @@ -1414,7 +1414,7 @@ public void testDispatchMethodName_02() throws Exception { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1436,7 +1436,7 @@ public void testDispatchMethodName_02() throws Exception { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void #method#(final Object i) {"); @@ -1495,7 +1495,7 @@ public void testDispatchMethodName_03() throws Exception { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1517,7 +1517,7 @@ public void testDispatchMethodName_03() throws Exception { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void method(final Object i) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/DispatchCompilerTest.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/DispatchCompilerTest.java index c62a61323f8..4a7b3bd543a 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/DispatchCompilerTest.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/DispatchCompilerTest.java @@ -57,7 +57,7 @@ public void testReservedJavaKeywords() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -105,7 +105,7 @@ public void testReservedJavaKeywords() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Object foo(final Object assert_) {"); @@ -139,7 +139,7 @@ public void testReservedJavaKeywords() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Object bar(final Object assert_, final String assert__1) {"); @@ -198,7 +198,7 @@ public void testExtensionParameters() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import org.eclipse.xtext.xbase.lib.Extension;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -216,7 +216,7 @@ public void testExtensionParameters() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public String m(final String s) {"); @@ -249,7 +249,7 @@ public void testThrowExceptionSingleDispatchCase_01() { _builder.append("}"); _builder.newLine(); StringConcatenation _builder_1 = new StringConcatenation(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -267,7 +267,7 @@ public void testThrowExceptionSingleDispatchCase_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void minus(final Object operand) {"); @@ -303,7 +303,7 @@ public void testThrowExceptionSingleDispatchCase_02() { _builder.append("}"); _builder.newLine(); StringConcatenation _builder_1 = new StringConcatenation(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -321,7 +321,7 @@ public void testThrowExceptionSingleDispatchCase_02() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public int minus(final Object operand) {"); @@ -370,7 +370,7 @@ public void testThrowException() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.DoubleExtensions;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -417,7 +417,7 @@ public void testThrowException() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public double minus(final Object e) {"); @@ -497,7 +497,7 @@ public void testAllCasesThrowException() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -535,7 +535,7 @@ public void testAllCasesThrowException() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void minus(final Object e) {"); @@ -616,7 +616,7 @@ public void testImplicitReturn_01() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.Exceptions;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -669,7 +669,7 @@ public void testImplicitReturn_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Number minus(final Object e) {"); @@ -741,7 +741,7 @@ public void testImplicitReturn_02() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.Exceptions;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -794,7 +794,7 @@ public void testImplicitReturn_02() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Number minus(final Object e) {"); @@ -865,7 +865,7 @@ public void testSamePrimitiveArgs() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -893,7 +893,7 @@ public void testSamePrimitiveArgs() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Object m(final Object sb, final int x) {"); @@ -979,7 +979,7 @@ public void testDifferentPrimitiveArgs_01() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1027,7 +1027,7 @@ public void testDifferentPrimitiveArgs_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Object m(final Number x) {"); @@ -1116,7 +1116,7 @@ public void testDifferentPrimitiveArgs_02() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1154,7 +1154,7 @@ public void testDifferentPrimitiveArgs_02() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public Object m(final Object x) {"); @@ -1211,7 +1211,7 @@ public void testVoidAndObjectDoNotGenerateUnusedCode() { _builder.append("}"); _builder.newLine(); StringConcatenation _builder_1 = new StringConcatenation(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1233,7 +1233,7 @@ public void testVoidAndObjectDoNotGenerateUnusedCode() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void doThing(final Object v) {"); @@ -1281,7 +1281,7 @@ public void testVoidAndStringDoNotGenerateUnusedCode() { _builder.append("}"); _builder.newLine(); StringConcatenation _builder_1 = new StringConcatenation(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1303,7 +1303,7 @@ public void testVoidAndStringDoNotGenerateUnusedCode() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void doThing(final String o) {"); @@ -1351,7 +1351,7 @@ public void testVoidAndObjectTwoParametersDoNotGenerateUnusedCode() { _builder.append("}"); _builder.newLine(); StringConcatenation _builder_1 = new StringConcatenation(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1373,7 +1373,7 @@ public void testVoidAndObjectTwoParametersDoNotGenerateUnusedCode() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void doThing(final Object p0, final Object p1) {"); @@ -1429,7 +1429,7 @@ public void testVoidNotAllCases() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1467,7 +1467,7 @@ public void testVoidNotAllCases() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public String toExpectation(final Object p1) {"); @@ -1526,7 +1526,7 @@ public void testVoidAndObjectTwoParametersButDifferentTypesGenerateElse() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1548,7 +1548,7 @@ public void testVoidAndObjectTwoParametersButDifferentTypesGenerateElse() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void doThing(final Object p0, final Number p1) {"); @@ -1608,7 +1608,7 @@ public void testSingleDispatchTwoParameters() { _builder.append("}"); _builder.newLine(); StringConcatenation _builder_1 = new StringConcatenation(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1623,7 +1623,7 @@ public void testSingleDispatchTwoParameters() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void doThing(final Object p0, final Integer p1) {"); @@ -1655,7 +1655,7 @@ public void testSingleDispatchTwoParametersOneVoid() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1670,7 +1670,7 @@ public void testSingleDispatchTwoParametersOneVoid() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void doThing(final Object p0, final Integer p1) {"); @@ -1717,7 +1717,7 @@ public void testSingleDispatchTwoParametersTwoVoid() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1732,7 +1732,7 @@ public void testSingleDispatchTwoParametersTwoVoid() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void doThing(final Object p0, final Object p1) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.java index a12553863f7..b764760778f 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/compiler/XtendCompilerTest.java @@ -845,7 +845,7 @@ public void testNonExplicitDispatchCases() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -873,7 +873,7 @@ public void testNonExplicitDispatchCases() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public int testFunction1(final CharSequence s) {"); @@ -954,7 +954,7 @@ public void testInheritedDispatchMethods_01() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -982,7 +982,7 @@ public void testInheritedDispatchMethods_01() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public int testFunction1(final Object i) {"); @@ -1060,7 +1060,7 @@ public void testInheritedDispatchMethods_02() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1078,7 +1078,7 @@ public void testInheritedDispatchMethods_02() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public int testFunction1(final Object d) {"); @@ -1171,7 +1171,7 @@ public void testInheritedDispatchMethods_03() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1199,7 +1199,7 @@ public void testInheritedDispatchMethods_03() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public int testFunction1(final Object d) {"); @@ -1298,7 +1298,7 @@ public void testInheritedDispatchMethods_04() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -1326,7 +1326,7 @@ public void testInheritedDispatchMethods_04() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public int testFunction1(final Object i) {"); @@ -7234,7 +7234,7 @@ public void testVisibilityOfDispatchMethods() { _builder_1.newLine(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -7256,7 +7256,7 @@ public void testVisibilityOfDispatchMethods() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void foo(final Object s) {"); @@ -7323,7 +7323,7 @@ public void testParenthesisInDispatchMethodsGuards() { _builder_1.newLine(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -7352,7 +7352,7 @@ public void testParenthesisInDispatchMethodsGuards() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void foo(final Object s, final Object other) {"); @@ -7437,7 +7437,7 @@ public void testParenthesisInDispatchMethodsGuards_reordered() { _builder_1.newLine(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -7466,7 +7466,7 @@ public void testParenthesisInDispatchMethodsGuards_reordered() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void foo(final Object s, final Object other) {"); @@ -7548,7 +7548,7 @@ public void testNoUnnecessaryCastInDispatchMethods() { _builder_1.newLine(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -7570,7 +7570,7 @@ public void testNoUnnecessaryCastInDispatchMethods() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public void foo(final Object s, final boolean b, final String other) {"); @@ -11795,7 +11795,7 @@ public void testBug412853() { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append("import java.util.Arrays;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.newLine(); _builder_1.append("@SuppressWarnings(\"all\")"); @@ -11823,7 +11823,7 @@ public void testBug412853() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("public int bug(final Element a) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/java8/compiler/CompilerBug427637Test.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/java8/compiler/CompilerBug427637Test.java index e3135559219..99369b3285c 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/java8/compiler/CompilerBug427637Test.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/java8/compiler/CompilerBug427637Test.java @@ -2560,7 +2560,7 @@ public void testBug_427637_15() { _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.Functions.Function1;"); _builder_1.newLine(); - _builder_1.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_1.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_1.newLine(); _builder_1.append("import org.eclipse.xtext.xbase.lib.IterableExtensions;"); _builder_1.newLine(); @@ -4025,7 +4025,7 @@ public void testBug_427637_15() { _builder_1.newLine(); _builder_1.newLine(); _builder_1.append(" "); - _builder_1.append("@Generated"); + _builder_1.append("@XbaseGenerated"); _builder_1.newLine(); _builder_1.append(" "); _builder_1.append("protected Function1> newFormattingData(final HiddenLeafs leafs, final PreferenceKey key, final FormattingDataFactory.FormattingDataInit it) {"); diff --git a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/AbstractReusableActiveAnnotationTests.java b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/AbstractReusableActiveAnnotationTests.java index ef7c0be6036..5b162f2ad3a 100644 --- a/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/AbstractReusableActiveAnnotationTests.java +++ b/org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/AbstractReusableActiveAnnotationTests.java @@ -3323,7 +3323,7 @@ public void testAddDispatchCase() { _builder_2.newLine(); _builder_2.append("import myannotation.AddDispatchCase;"); _builder_2.newLine(); - _builder_2.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_2.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_2.newLine(); _builder_2.newLine(); _builder_2.append("@AddDispatchCase"); @@ -3343,7 +3343,7 @@ public void testAddDispatchCase() { _builder_2.newLine(); _builder_2.newLine(); _builder_2.append(" "); - _builder_2.append("@Generated"); + _builder_2.append("@XbaseGenerated"); _builder_2.newLine(); _builder_2.append(" "); _builder_2.append("public String m(final Object i) {"); @@ -3535,7 +3535,7 @@ public void testChangeDispatchHierachy() { _builder_5.newLine(); _builder_5.append("import myannotation.Base;"); _builder_5.newLine(); - _builder_5.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_5.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_5.newLine(); _builder_5.newLine(); _builder_5.append("@SuppressWarnings(\"all\")"); @@ -3550,7 +3550,7 @@ public void testChangeDispatchHierachy() { _builder_5.newLine(); _builder_5.newLine(); _builder_5.append(" "); - _builder_5.append("@Generated"); + _builder_5.append("@XbaseGenerated"); _builder_5.newLine(); _builder_5.append(" "); _builder_5.append("public void m(final Base b) {"); @@ -3574,7 +3574,7 @@ public void testChangeDispatchHierachy() { _builder_6.newLine(); _builder_6.append("import myannotation.Base;"); _builder_6.newLine(); - _builder_6.append("import org.eclipse.xtext.xbase.lib.Generated;"); + _builder_6.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); _builder_6.newLine(); _builder_6.newLine(); _builder_6.append("@SuppressWarnings(\"all\")"); @@ -3603,7 +3603,7 @@ public void testChangeDispatchHierachy() { _builder_6.newLine(); _builder_6.newLine(); _builder_6.append(" "); - _builder_6.append("@Generated"); + _builder_6.append("@XbaseGenerated"); _builder_6.newLine(); _builder_6.append(" "); _builder_6.append("public void m(final Base d) {"); diff --git a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/jvmmodel/XtendJvmModelInferrer.java b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/jvmmodel/XtendJvmModelInferrer.java index b5f5e075e8f..5b17e44b4c0 100644 --- a/org.eclipse.xtend.core/src/org/eclipse/xtend/core/jvmmodel/XtendJvmModelInferrer.java +++ b/org.eclipse.xtend.core/src/org/eclipse/xtend/core/jvmmodel/XtendJvmModelInferrer.java @@ -85,7 +85,7 @@ import org.eclipse.xtext.xbase.jvmmodel.JvmTypeExtensions; import org.eclipse.xtext.xbase.jvmmodel.JvmTypesBuilder; import org.eclipse.xtext.xbase.lib.Extension; -import org.eclipse.xtext.xbase.lib.Generated; +import org.eclipse.xtext.xbase.lib.XbaseGenerated; import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; import org.eclipse.xtext.xbase.resource.BatchLinkableResource; @@ -490,7 +490,7 @@ protected void appendSyntheticDispatchMethods(XtendTypeDeclaration source, final JvmOperation operation = deriveGenericDispatchOperationSignature(localOperations, target); if (operation != null) { dispatchHelper.markAsDispatcherFunction(operation); - operation.getAnnotations().add(_annotationTypesBuilder.annotationRef(Generated.class)); + operation.getAnnotations().add(_annotationTypesBuilder.annotationRef(XbaseGenerated.class)); operation.setSimpleName(signature.getSimpleName()); operation.setReturnType(jvmTypesBuilder.inferredType()); } diff --git a/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/macros/AbstractReusableActiveAnnotationTests.xtend b/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/macros/AbstractReusableActiveAnnotationTests.xtend index fb5f7932262..f4037c97f85 100644 --- a/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/macros/AbstractReusableActiveAnnotationTests.xtend +++ b/org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/macros/AbstractReusableActiveAnnotationTests.xtend @@ -1749,6 +1749,7 @@ abstract class AbstractReusableActiveAnnotationTests { import java.util.Arrays; import myannotation.AddDispatchCase; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @AddDispatchCase @SuppressWarnings("all") @@ -1757,6 +1758,7 @@ abstract class AbstractReusableActiveAnnotationTests { return null; } + @XbaseGenerated public String m(final Object i) { if (i instanceof Integer) { return _m((Integer)i); @@ -1856,12 +1858,14 @@ abstract class AbstractReusableActiveAnnotationTests { package myusercode; import myannotation.Base; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class D1 { protected void _m(final Base b) { } + @XbaseGenerated public void m(final Base b) { _m(b); return; @@ -1873,6 +1877,7 @@ abstract class AbstractReusableActiveAnnotationTests { import java.util.Arrays; import myannotation.Base; + import org.eclipse.xtext.xbase.lib.XbaseGenerated; @SuppressWarnings("all") public class D2 extends D1 { @@ -1885,6 +1890,7 @@ abstract class AbstractReusableActiveAnnotationTests { protected void _m(final Derived3 d) { } + @XbaseGenerated public void m(final Base d) { if (d instanceof Derived1) { _m((Derived1)d); diff --git a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/macros/AbstractReusableActiveAnnotationTests.java b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/macros/AbstractReusableActiveAnnotationTests.java index ff0c3ec7b14..0fb4b380e9f 100644 --- a/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/macros/AbstractReusableActiveAnnotationTests.java +++ b/org.eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/macros/AbstractReusableActiveAnnotationTests.java @@ -3323,6 +3323,8 @@ public void testAddDispatchCase() { _builder_2.newLine(); _builder_2.append("import myannotation.AddDispatchCase;"); _builder_2.newLine(); + _builder_2.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); + _builder_2.newLine(); _builder_2.newLine(); _builder_2.append("@AddDispatchCase"); _builder_2.newLine(); @@ -3341,6 +3343,9 @@ public void testAddDispatchCase() { _builder_2.newLine(); _builder_2.newLine(); _builder_2.append(" "); + _builder_2.append("@XbaseGenerated"); + _builder_2.newLine(); + _builder_2.append(" "); _builder_2.append("public String m(final Object i) {"); _builder_2.newLine(); _builder_2.append(" "); @@ -3530,6 +3535,8 @@ public void testChangeDispatchHierachy() { _builder_5.newLine(); _builder_5.append("import myannotation.Base;"); _builder_5.newLine(); + _builder_5.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); + _builder_5.newLine(); _builder_5.newLine(); _builder_5.append("@SuppressWarnings(\"all\")"); _builder_5.newLine(); @@ -3543,6 +3550,9 @@ public void testChangeDispatchHierachy() { _builder_5.newLine(); _builder_5.newLine(); _builder_5.append(" "); + _builder_5.append("@XbaseGenerated"); + _builder_5.newLine(); + _builder_5.append(" "); _builder_5.append("public void m(final Base b) {"); _builder_5.newLine(); _builder_5.append(" "); @@ -3564,6 +3574,8 @@ public void testChangeDispatchHierachy() { _builder_6.newLine(); _builder_6.append("import myannotation.Base;"); _builder_6.newLine(); + _builder_6.append("import org.eclipse.xtext.xbase.lib.XbaseGenerated;"); + _builder_6.newLine(); _builder_6.newLine(); _builder_6.append("@SuppressWarnings(\"all\")"); _builder_6.newLine(); @@ -3591,6 +3603,9 @@ public void testChangeDispatchHierachy() { _builder_6.newLine(); _builder_6.newLine(); _builder_6.append(" "); + _builder_6.append("@XbaseGenerated"); + _builder_6.newLine(); + _builder_6.append(" "); _builder_6.append("public void m(final Base d) {"); _builder_6.newLine(); _builder_6.append(" "); diff --git a/org.eclipse.xtext.xbase.lib/src/org/eclipse/xtext/xbase/lib/Generated.java b/org.eclipse.xtext.xbase.lib/src/org/eclipse/xtext/xbase/lib/XbaseGenerated.java similarity index 95% rename from org.eclipse.xtext.xbase.lib/src/org/eclipse/xtext/xbase/lib/Generated.java rename to org.eclipse.xtext.xbase.lib/src/org/eclipse/xtext/xbase/lib/XbaseGenerated.java index 5b69e9c0552..af8458bcf3e 100644 --- a/org.eclipse.xtext.xbase.lib/src/org/eclipse/xtext/xbase/lib/Generated.java +++ b/org.eclipse.xtext.xbase.lib/src/org/eclipse/xtext/xbase/lib/XbaseGenerated.java @@ -33,6 +33,6 @@ }) @Documented @Beta -@GwtCompatible public @interface Generated { +@GwtCompatible public @interface XbaseGenerated { }