Merge branch 'master' into netbeans

5 files changed, 31 insertions, 9 deletions

diff --git a/test/lombok/resource/after/CleanupPlain.java b/test/lombok/resource/after/CleanupPlain.java
index 25c66ced..35d51543 100644
--- a/test/lombok/resource/after/CleanupPlain.java
+++ b/test/lombok/resource/after/CleanupPlain.java
@@ -1,5 +1,5 @@
 import java.io.*;
-class Cleanup {
+class CleanupPlain {
 	void test() throws Exception {
 		InputStream in = new FileInputStream("in");
 		try {
diff --git a/test/lombok/resource/after/CommentsInterspersed.java b/test/lombok/resource/after/CommentsInterspersed.java
index f3841606..275f198f 100644
--- a/test/lombok/resource/after/CommentsInterspersed.java
+++ b/test/lombok/resource/after/CommentsInterspersed.java
@@ -1,13 +1,9 @@
-/* cmt */
-/* cmt2 */
-/* cmt3 */
-/*bla */
+/* cmt *//* cmt2 */ /* cmt3 */ /*bla */ 
 public class CommentsInterspersed {
 	/** javadoc for field */
 	private int x;
 	
-	/* bla2 */
-	private String test = "foo"; //$NON-NLS-1$
+	/* bla2 */ private String test = "foo"; //$NON-NLS-1$
 	
 	/** Javadoc on method */
 	public native void gwtTest(); /*-{
diff --git a/test/lombok/resource/after/GetterPlain.java b/test/lombok/resource/after/GetterPlain.java
index 04944df8..5e8cc965 100644
--- a/test/lombok/resource/after/GetterPlain.java
+++ b/test/lombok/resource/after/GetterPlain.java
@@ -1,4 +1,4 @@
-class Getter {
+class GetterPlain {
 	int i;
 	int foo;
 	public int getI() {
diff --git a/test/lombok/resource/after/SetterPlain.java b/test/lombok/resource/after/SetterPlain.java
index 2570365c..8faad0ec 100644
--- a/test/lombok/resource/after/SetterPlain.java
+++ b/test/lombok/resource/after/SetterPlain.java
@@ -1,4 +1,4 @@
-class Setter {
+class SetterPlain {
 	int i;
 	int foo;
 	public void setI(final int i) {
diff --git a/test/lombok/resource/after/SynchronizedPlain.java b/test/lombok/resource/after/SynchronizedPlain.java
new file mode 100644
index 00000000..fcbe03f2
--- /dev/null
+++ b/test/lombok/resource/after/SynchronizedPlain.java
@@ -0,0 +1,26 @@
+class SynchronizedPlain1 {
+	void test() {
+		synchronized ($lock) {
+			System.out.println("one");
+		}
+	}
+	void test2() {
+		synchronized ($lock) {
+			System.out.println("two");
+		}
+	}
+	private final java.lang.Object $lock = new java.lang.Object[0];
+}
+class SynchronizedPlain2 {
+	static void test() {
+		synchronized ($LOCK) {
+			System.out.println("three");
+		}
+	}
+	static void test2() {
+		synchronized ($LOCK) {
+			System.out.println("four");
+		}
+	}
+	private static final java.lang.Object $LOCK = new java.lang.Object[0];
+}
\ No newline at end of file