diff options
author | Roel Spilker <r.spilker@gmail.com> | 2010-11-07 15:16:48 +0100 |
---|---|---|
committer | Roel Spilker <r.spilker@gmail.com> | 2010-11-07 15:16:48 +0100 |
commit | 2097dd87310026733a4f48c47bb31a59996f5d83 (patch) | |
tree | 07b67c81a738699a5f076725c2388e5e439cf6bc /test/transform/resource | |
parent | 378b939108ef2216da00724a8efd9521b7a10b8f (diff) | |
download | lombok-2097dd87310026733a4f48c47bb31a59996f5d83.tar.gz lombok-2097dd87310026733a4f48c47bb31a59996f5d83.tar.bz2 lombok-2097dd87310026733a4f48c47bb31a59996f5d83.zip |
Solved issue 155: "Eclipse constructor generation not in class body" http://code.google.com/p/projectlombok/issues/detail?id=155
Now all lombok generated methods are located before any other method.
Diffstat (limited to 'test/transform/resource')
18 files changed, 128 insertions, 127 deletions
diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java index fdb6f122..fb9df0ea 100644 --- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java +++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java @@ -1,9 +1,9 @@ class GetFoo { private @lombok.Getter int foo; - GetFoo() { - super(); - } public @java.lang.SuppressWarnings("all") int getFoo() { return this.foo; } + GetFoo() { + super(); + } } diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java index d708ad72..60c69aed 100644 --- a/test/transform/resource/after-ecj/CommentsInterspersed.java +++ b/test/transform/resource/after-ecj/CommentsInterspersed.java @@ -2,11 +2,11 @@ import lombok.Getter; public class CommentsInterspersed { private int x; private @Getter String test = "foo"; + public @java.lang.SuppressWarnings("all") String getTest() { + return this.test; + } public CommentsInterspersed() { super(); } public native void gwtTest(); - public @java.lang.SuppressWarnings("all") String getTest() { - return this.test; - } } diff --git a/test/transform/resource/after-ecj/GetterAccessLevel.java b/test/transform/resource/after-ecj/GetterAccessLevel.java index 14edfb56..f0de95e7 100644 --- a/test/transform/resource/after-ecj/GetterAccessLevel.java +++ b/test/transform/resource/after-ecj/GetterAccessLevel.java @@ -10,9 +10,6 @@ class GetterAccessLevel { @lombok.Getter(lombok.AccessLevel.PROTECTED) String protectedString; @lombok.Getter(lombok.AccessLevel.PUBLIC) String publicString; @lombok.Getter(value = lombok.AccessLevel.PUBLIC) String value; - GetterAccessLevel() { - super(); - } private @java.lang.SuppressWarnings("all") boolean isPrivate() { return this.isPrivate; } @@ -40,4 +37,7 @@ class GetterAccessLevel { public @java.lang.SuppressWarnings("all") String getValue() { return this.value; } + GetterAccessLevel() { + super(); + } } diff --git a/test/transform/resource/after-ecj/GetterAlreadyExists.java b/test/transform/resource/after-ecj/GetterAlreadyExists.java index 959b6a64..f491f147 100644 --- a/test/transform/resource/after-ecj/GetterAlreadyExists.java +++ b/test/transform/resource/after-ecj/GetterAlreadyExists.java @@ -27,27 +27,27 @@ class Getter3 { } class Getter4 { @lombok.Getter String foo; + public @java.lang.SuppressWarnings("all") String getFoo() { + return this.foo; + } Getter4() { super(); } String hasFoo() { return null; } - public @java.lang.SuppressWarnings("all") String getFoo() { - return this.foo; - } } class Getter5 { @lombok.Getter String foo; + public @java.lang.SuppressWarnings("all") String getFoo() { + return this.foo; + } Getter5() { super(); } String isFoo() { return null; } - public @java.lang.SuppressWarnings("all") String getFoo() { - return this.foo; - } } class Getter6 { @lombok.Getter String foo; @@ -60,27 +60,27 @@ class Getter6 { } class Getter7 { @lombok.Getter String foo; + public @java.lang.SuppressWarnings("all") String getFoo() { + return this.foo; + } Getter7() { super(); } boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { - return this.foo; - } } class Getter8 { @lombok.Getter String foo; + public @java.lang.SuppressWarnings("all") String getFoo() { + return this.foo; + } Getter8() { super(); } boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { - return this.foo; - } } class Getter9 { @lombok.Getter String foo; @@ -120,27 +120,27 @@ class Getter12 { } class Getter13 { @lombok.Getter String foo; + public @java.lang.SuppressWarnings("all") String getFoo() { + return this.foo; + } Getter13() { super(); } static boolean hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { - return this.foo; - } } class Getter14 { @lombok.Getter String foo; + public @java.lang.SuppressWarnings("all") String getFoo() { + return this.foo; + } Getter14() { super(); } static boolean isFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { - return this.foo; - } } class Getter15 { @lombok.Getter String foo; @@ -153,27 +153,27 @@ class Getter15 { } class Getter16 { @lombok.Getter String foo; + public @java.lang.SuppressWarnings("all") String getFoo() { + return this.foo; + } Getter16() { super(); } static String hasFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { - return this.foo; - } } class Getter17 { @lombok.Getter String foo; + public @java.lang.SuppressWarnings("all") String getFoo() { + return this.foo; + } Getter17() { super(); } static String isFoo() { return false; } - public @java.lang.SuppressWarnings("all") String getFoo() { - return this.foo; - } } class Getter18 { @lombok.Getter String foo; diff --git a/test/transform/resource/after-ecj/GetterBoolean.java b/test/transform/resource/after-ecj/GetterBoolean.java index caf758c1..e9e4f370 100644 --- a/test/transform/resource/after-ecj/GetterBoolean.java +++ b/test/transform/resource/after-ecj/GetterBoolean.java @@ -2,9 +2,6 @@ class Getter { @lombok.Getter boolean foo; @lombok.Getter boolean isBar; @lombok.Getter boolean hasBaz; - Getter() { - super(); - } public @java.lang.SuppressWarnings("all") boolean isFoo() { return this.foo; } @@ -14,6 +11,9 @@ class Getter { public @java.lang.SuppressWarnings("all") boolean hasBaz() { return this.hasBaz; } + Getter() { + super(); + } } class MoreGetter { @lombok.Getter boolean foo; diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java index 7668c9d3..421aa150 100644 --- a/test/transform/resource/after-ecj/GetterOnClass.java +++ b/test/transform/resource/after-ecj/GetterOnClass.java @@ -1,67 +1,68 @@ @lombok.Getter class GetterOnClass1 { @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone; boolean isPublic; - GetterOnClass1() { - super(); - } public @java.lang.SuppressWarnings("all") boolean isPublic() { return this.isPublic; } + GetterOnClass1() { + super(); + } + } @lombok.Getter(lombok.AccessLevel.PROTECTED) class GetterOnClass2 { @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone; boolean isProtected; @lombok.Getter(lombok.AccessLevel.PACKAGE) boolean isPackage; - GetterOnClass2() { - super(); - } @java.lang.SuppressWarnings("all") boolean isPackage() { return this.isPackage; } protected @java.lang.SuppressWarnings("all") boolean isProtected() { return this.isProtected; } + GetterOnClass2() { + super(); + } } @lombok.Getter(lombok.AccessLevel.PACKAGE) class GetterOnClass3 { @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone; boolean isPackage; - GetterOnClass3() { - super(); - } @java.lang.SuppressWarnings("all") boolean isPackage() { return this.isPackage; } + GetterOnClass3() { + super(); + } } @lombok.Getter(lombok.AccessLevel.PRIVATE) class GetterOnClass4 { @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone; boolean isPrivate; - GetterOnClass4() { - super(); - } private @java.lang.SuppressWarnings("all") boolean isPrivate() { return this.isPrivate; } + GetterOnClass4() { + super(); + } } @lombok.Getter(lombok.AccessLevel.PUBLIC) class GetterOnClass5 { @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone; boolean isPublic; - GetterOnClass5() { - super(); - } public @java.lang.SuppressWarnings("all") boolean isPublic() { return this.isPublic; } + GetterOnClass5() { + super(); + } } @lombok.Getter class GetterOnClass6 { String couldBeNull; @lombok.NonNull String nonNull; - GetterOnClass6() { - super(); - } public @java.lang.SuppressWarnings("all") String getCouldBeNull() { return this.couldBeNull; } public @lombok.NonNull @java.lang.SuppressWarnings("all") String getNonNull() { return this.nonNull; } -} + GetterOnClass6() { + super(); + } +}
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterOnStatic.java b/test/transform/resource/after-ecj/GetterOnStatic.java index ee90b897..538f25cb 100644 --- a/test/transform/resource/after-ecj/GetterOnStatic.java +++ b/test/transform/resource/after-ecj/GetterOnStatic.java @@ -3,13 +3,13 @@ class Getter { static @lombok.Getter int bar; <clinit>() { } - Getter() { - super(); - } public static @java.lang.SuppressWarnings("all") boolean isFoo() { return Getter.foo; } public static @java.lang.SuppressWarnings("all") int getBar() { return Getter.bar; } + Getter() { + super(); + } } diff --git a/test/transform/resource/after-ecj/GetterPlain.java b/test/transform/resource/after-ecj/GetterPlain.java index 19e24c77..cd096ca3 100644 --- a/test/transform/resource/after-ecj/GetterPlain.java +++ b/test/transform/resource/after-ecj/GetterPlain.java @@ -2,13 +2,13 @@ import lombok.Getter; class GetterPlain { @lombok.Getter int i; @Getter int foo; - GetterPlain() { - super(); - } public @java.lang.SuppressWarnings("all") int getI() { return this.i; } public @java.lang.SuppressWarnings("all") int getFoo() { return this.foo; } + GetterPlain() { + super(); + } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterWithDollar.java b/test/transform/resource/after-ecj/GetterWithDollar.java index f4bc799c..b102ba66 100644 --- a/test/transform/resource/after-ecj/GetterWithDollar.java +++ b/test/transform/resource/after-ecj/GetterWithDollar.java @@ -1,22 +1,22 @@ class GetterWithDollar1 { @lombok.Getter int $i; - GetterWithDollar1() { - super(); - } public @java.lang.SuppressWarnings("all") int get$i() { return this.$i; } + GetterWithDollar1() { + super(); + } } class GetterWithDollar2 { @lombok.Getter int $i; @lombok.Getter int i; - GetterWithDollar2() { - super(); - } public @java.lang.SuppressWarnings("all") int get$i() { return this.$i; } public @java.lang.SuppressWarnings("all") int getI() { return this.i; } + GetterWithDollar2() { + super(); + } } diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java index 4ed6038d..16368f25 100644 --- a/test/transform/resource/after-ecj/MultiFieldGetter.java +++ b/test/transform/resource/after-ecj/MultiFieldGetter.java @@ -3,26 +3,26 @@ import lombok.AccessLevel; class MultiFieldGetter { @Getter(AccessLevel.PROTECTED) int x; @Getter(AccessLevel.PROTECTED) int y; - MultiFieldGetter() { - super(); - } protected @java.lang.SuppressWarnings("all") int getX() { return this.x; } protected @java.lang.SuppressWarnings("all") int getY() { return this.y; } + MultiFieldGetter() { + super(); + } } @Getter class MultiFieldGetter2 { @Getter(AccessLevel.PACKAGE) int x; @Getter(AccessLevel.PACKAGE) int y; - MultiFieldGetter2() { - super(); - } @java.lang.SuppressWarnings("all") int getX() { return this.x; } @java.lang.SuppressWarnings("all") int getY() { return this.y; } + MultiFieldGetter2() { + super(); + } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/NonNullPlain.java b/test/transform/resource/after-ecj/NonNullPlain.java index 877f97ae..6f552436 100644 --- a/test/transform/resource/after-ecj/NonNullPlain.java +++ b/test/transform/resource/after-ecj/NonNullPlain.java @@ -1,9 +1,6 @@ class NonNullPlain { @lombok.Setter @lombok.NonNull @lombok.Getter int i; @lombok.Getter @lombok.Setter @lombok.NonNull String s; - NonNullPlain() { - super(); - } public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) { this.i = i; } @@ -18,4 +15,7 @@ class NonNullPlain { throw new java.lang.NullPointerException("s"); this.s = s; } + NonNullPlain() { + super(); + } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/SetterAccessLevel.java b/test/transform/resource/after-ecj/SetterAccessLevel.java index 20eb9d2c..deee8213 100644 --- a/test/transform/resource/after-ecj/SetterAccessLevel.java +++ b/test/transform/resource/after-ecj/SetterAccessLevel.java @@ -5,9 +5,6 @@ class SetterAccessLevel { @lombok.Setter(lombok.AccessLevel.PROTECTED) boolean isProtected; @lombok.Setter(lombok.AccessLevel.PUBLIC) boolean isPublic; @lombok.Setter(value = lombok.AccessLevel.PUBLIC) boolean value; - SetterAccessLevel() { - super(); - } private @java.lang.SuppressWarnings("all") void setIsPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } @@ -23,4 +20,7 @@ class SetterAccessLevel { public @java.lang.SuppressWarnings("all") void setValue(final boolean value) { this.value = value; } + SetterAccessLevel() { + super(); + } } diff --git a/test/transform/resource/after-ecj/SetterOnClass.java b/test/transform/resource/after-ecj/SetterOnClass.java index e92e217c..084323c4 100644 --- a/test/transform/resource/after-ecj/SetterOnClass.java +++ b/test/transform/resource/after-ecj/SetterOnClass.java @@ -1,63 +1,60 @@ @lombok.Setter class SetterOnClass1 { @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone; boolean isPublic; - SetterOnClass1() { - super(); - } public @java.lang.SuppressWarnings("all") void setIsPublic(final boolean isPublic) { this.isPublic = isPublic; } + SetterOnClass1() { + super(); + } } @lombok.Setter(lombok.AccessLevel.PROTECTED) class SetterOnClass2 { @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone; boolean isProtected; @lombok.Setter(lombok.AccessLevel.PACKAGE) boolean isPackage; - SetterOnClass2() { - super(); - } @java.lang.SuppressWarnings("all") void setIsPackage(final boolean isPackage) { this.isPackage = isPackage; } protected @java.lang.SuppressWarnings("all") void setIsProtected(final boolean isProtected) { this.isProtected = isProtected; } + SetterOnClass2() { + super(); + } } @lombok.Setter(lombok.AccessLevel.PACKAGE) class SetterOnClass3 { @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone; boolean isPackage; - SetterOnClass3() { - super(); - } @java.lang.SuppressWarnings("all") void setIsPackage(final boolean isPackage) { this.isPackage = isPackage; } + SetterOnClass3() { + super(); + } } @lombok.Setter(lombok.AccessLevel.PRIVATE) class SetterOnClass4 { @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone; boolean isPrivate; - SetterOnClass4() { - super(); - } private @java.lang.SuppressWarnings("all") void setIsPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } + SetterOnClass4() { + super(); + } } @lombok.Setter(lombok.AccessLevel.PUBLIC) class SetterOnClass5 { @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone; boolean isPublic; - SetterOnClass5() { - super(); - } public @java.lang.SuppressWarnings("all") void setIsPublic(final boolean isPublic) { this.isPublic = isPublic; } + SetterOnClass5() { + super(); + } } @lombok.Setter class SetterOnClass6 { String couldBeNull; @lombok.NonNull String nonNull; - SetterOnClass6() { - super(); - } public @java.lang.SuppressWarnings("all") void setCouldBeNull(final String couldBeNull) { this.couldBeNull = couldBeNull; } @@ -66,4 +63,7 @@ throw new java.lang.NullPointerException("nonNull"); this.nonNull = nonNull; } + SetterOnClass6() { + super(); + } } diff --git a/test/transform/resource/after-ecj/SetterOnStatic.java b/test/transform/resource/after-ecj/SetterOnStatic.java index 8a5abdd8..c1e4d3d1 100644 --- a/test/transform/resource/after-ecj/SetterOnStatic.java +++ b/test/transform/resource/after-ecj/SetterOnStatic.java @@ -3,13 +3,13 @@ class Setter { static @lombok.Setter int bar; <clinit>() { } - Setter() { - super(); - } public static @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) { Setter.foo = foo; } public static @java.lang.SuppressWarnings("all") void setBar(final int bar) { Setter.bar = bar; } + Setter() { + super(); + } } diff --git a/test/transform/resource/after-ecj/SetterPlain.java b/test/transform/resource/after-ecj/SetterPlain.java index 7f0a4a81..08154244 100644 --- a/test/transform/resource/after-ecj/SetterPlain.java +++ b/test/transform/resource/after-ecj/SetterPlain.java @@ -2,13 +2,13 @@ import lombok.Setter; class SetterPlain { @lombok.Setter int i; @Setter int foo; - SetterPlain() { - super(); - } public @java.lang.SuppressWarnings("all") void setI(final int i) { this.i = i; } public @java.lang.SuppressWarnings("all") void setFoo(final int foo) { this.foo = foo; } + SetterPlain() { + super(); + } }
\ No newline at end of file diff --git a/test/transform/resource/after-ecj/SetterWithDollar.java b/test/transform/resource/after-ecj/SetterWithDollar.java index c5bc14f1..bf27536b 100644 --- a/test/transform/resource/after-ecj/SetterWithDollar.java +++ b/test/transform/resource/after-ecj/SetterWithDollar.java @@ -1,22 +1,22 @@ class SetterWithDollar1 { @lombok.Setter int $i; - SetterWithDollar1() { - super(); - } public @java.lang.SuppressWarnings("all") void set$i(final int $i) { this.$i = $i; } + SetterWithDollar1() { + super(); + } } class SetterWithDollar2 { @lombok.Setter int $i; @lombok.Setter int i; - SetterWithDollar2() { - super(); - } public @java.lang.SuppressWarnings("all") void set$i(final int $i) { this.$i = $i; } public @java.lang.SuppressWarnings("all") void setI(final int i) { this.i = i; } + SetterWithDollar2() { + super(); + } } diff --git a/test/transform/resource/after-ecj/ToStringInner.java b/test/transform/resource/after-ecj/ToStringInner.java index 2f14407e..963299db 100644 --- a/test/transform/resource/after-ecj/ToStringInner.java +++ b/test/transform/resource/after-ecj/ToStringInner.java @@ -2,31 +2,31 @@ import lombok.ToString; @ToString class ToStringOuter { @ToString class ToStringInner { final int y; - ToStringInner() { - super(); - } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { return (("ToStringOuter.ToStringInner(y=" + this.y) + ")"); } + ToStringInner() { + super(); + } } static @ToString class ToStringStaticInner { final int y; - ToStringStaticInner() { - super(); - } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")"); } + ToStringStaticInner() { + super(); + } } class ToStringMiddle { @ToString class ToStringMoreInner { final String name; - ToStringMoreInner() { - super(); - } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")"); } + ToStringMoreInner() { + super(); + } } ToStringMiddle() { super(); @@ -34,10 +34,10 @@ import lombok.ToString; } final int x; String name; - ToStringOuter() { - super(); - } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")"); } + ToStringOuter() { + super(); + } } diff --git a/test/transform/resource/after-ecj/ToStringPlain.java b/test/transform/resource/after-ecj/ToStringPlain.java index 7196abb9..458f78d0 100644 --- a/test/transform/resource/after-ecj/ToStringPlain.java +++ b/test/transform/resource/after-ecj/ToStringPlain.java @@ -2,20 +2,20 @@ import lombok.ToString; @lombok.ToString class ToString1 { final int x; String name; - ToString1() { - super(); - } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")"); } + ToString1() { + super(); + } } @ToString class ToString2 { final int x; String name; - ToString2() { - super(); - } public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() { return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")"); } + ToString2() { + super(); + } } |