Merge branch 'master' into netbeans

5 files changed, 86 insertions, 4 deletions

diff --git a/test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java b/test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java
new file mode 100644
index 00000000..556e907c
--- /dev/null
+++ b/test/delombok/src/lombok/delombok/TestLombokFilesIdempotent.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.delombok;
+
+import java.io.File;
+
+import lombok.DirectoryRunner;
+import lombok.RunTestsViaDelombok;
+
+import org.junit.runner.RunWith;
+
+@RunWith(DirectoryRunner.class)
+public class TestLombokFilesIdempotent {
+	
+	public static File getBeforeDirectory() {
+		RunTestsViaDelombok.printErrors(true);
+		return getAfterDirectory();
+	}
+	
+	public static File getAfterDirectory() {
+		return new File("test/lombok/resource/after");
+	}
+}
diff --git a/test/lombok/resource/after/CommentsInterspersed.java b/test/lombok/resource/after/CommentsInterspersed.java
index 275f198f..ddc716c9 100644
--- a/test/lombok/resource/after/CommentsInterspersed.java
+++ b/test/lombok/resource/after/CommentsInterspersed.java
@@ -1,16 +1,15 @@
-/* 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$
-	
 	/** Javadoc on method */
 	public native void gwtTest(); /*-{
 		javascript;
 	}-*/
-	
 	public String getTest() {
 		return test;
 	}
 } //haha!
+//hahaha!
+//hahahaha!
diff --git a/test/lombok/resource/after/SynchronizedName.java b/test/lombok/resource/after/SynchronizedName.java
new file mode 100644
index 00000000..a3e64796
--- /dev/null
+++ b/test/lombok/resource/after/SynchronizedName.java
@@ -0,0 +1,20 @@
+class SynchronizedName {
+	private Object read = new Object();
+	private static Object READ = new Object();
+	void test1() {
+		synchronized (read) {
+			System.out.println("one");
+		}
+	}
+	void test2() {
+		System.out.println("two");
+	}
+	static void test3() {
+		System.out.println("three");
+	}
+	void test4() {
+		synchronized (READ) {
+			System.out.println("four");
+		}
+	}
+}
diff --git a/test/lombok/resource/before/CommentsInterspersed.java b/test/lombok/resource/before/CommentsInterspersed.java
index 455c680d..e7898aaa 100644
--- a/test/lombok/resource/before/CommentsInterspersed.java
+++ b/test/lombok/resource/before/CommentsInterspersed.java
@@ -11,4 +11,7 @@ public /*bla */ class CommentsInterspersed {
 		javascript;
 	}-*/
 } //haha!
+//hahaha!
+
+//hahahaha!
 
diff --git a/test/lombok/resource/before/SynchronizedName.java b/test/lombok/resource/before/SynchronizedName.java
new file mode 100644
index 00000000..3aaec705
--- /dev/null
+++ b/test/lombok/resource/before/SynchronizedName.java
@@ -0,0 +1,18 @@
+//ignore
+class SynchronizedName {
+	private Object read = new Object();
+	private static Object READ = new Object();
+	
+	@lombok.Synchronized("read") void test1() {
+		System.out.println("one");
+	}
+	@lombok.Synchronized("write") void test2() {
+		System.out.println("two");
+	}
+	@lombok.Synchronized("read") static void test3() {
+		System.out.println("three");
+	}	
+	@lombok.Synchronized("READ") void test4() {
+		System.out.println("four");
+	}	
+}