aboutsummaryrefslogtreecommitdiff
path: root/test/transform/resource/messages-ecj
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2012-08-06 20:37:21 +0200
committerReinier Zwitserloot <reinier@zwitserloot.com>2012-08-06 20:37:21 +0200
commit87f763a94c87b03da269d110c44e7e750ddf5211 (patch)
tree05d59604320510e4bb7d5014917ba275e9061e5a /test/transform/resource/messages-ecj
parenteb4cbcd8bbd7bf7784aa229e9b6c5fe0670fa7a5 (diff)
parent34055fcdff786c9b809ce1a08c1c9218968ebc7d (diff)
downloadlombok-87f763a94c87b03da269d110c44e7e750ddf5211.tar.gz
lombok-87f763a94c87b03da269d110c44e7e750ddf5211.tar.bz2
lombok-87f763a94c87b03da269d110c44e7e750ddf5211.zip
Merge branch 'master' into wither
Conflicts: src/core/lombok/javac/handlers/JavacHandlerUtil.java
Diffstat (limited to 'test/transform/resource/messages-ecj')
-rw-r--r--test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/SynchronizedName.java.messages3
-rw-r--r--test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages1
-rw-r--r--test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages1
4 files changed, 4 insertions, 2 deletions
diff --git a/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages b/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages
new file mode 100644
index 00000000..ecbf4a61
--- /dev/null
+++ b/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages
@@ -0,0 +1 @@
+1 warning Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used.
diff --git a/test/transform/resource/messages-ecj/SynchronizedName.java.messages b/test/transform/resource/messages-ecj/SynchronizedName.java.messages
index d200ac0e..4c428aac 100644
--- a/test/transform/resource/messages-ecj/SynchronizedName.java.messages
+++ b/test/transform/resource/messages-ecj/SynchronizedName.java.messages
@@ -1,2 +1 @@
-8 error The field write does not exist.
-11 error Cannot make a static reference to the non-static field SynchronizedName.read \ No newline at end of file
+8 warning The static field SynchronizedName.READ should be accessed in a static way
diff --git a/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages b/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages
new file mode 100644
index 00000000..f16d071a
--- /dev/null
+++ b/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages
@@ -0,0 +1 @@
+5 error The field write does not exist.
diff --git a/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages b/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages
new file mode 100644
index 00000000..c207cd70
--- /dev/null
+++ b/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages
@@ -0,0 +1 @@
+5 error Cannot make a static reference to the non-static field SynchronizedNameStaticToInstanceRef.read