Merge branch 'master' into extensionmethod

Conflicts:
	build.xml

2 files changed, 75 insertions, 0 deletions

diff --git a/test/pretty/resource/after/ThisParameter.java b/test/pretty/resource/after/ThisParameter.java
new file mode 100644
index 00000000..49452a59
--- /dev/null
+++ b/test/pretty/resource/after/ThisParameter.java
@@ -0,0 +1,34 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+class ThisParameter {
+	void untagged(ThisParameter this, int i) {
+		// no content
+	}
+	void sourceTagged(@SourceTagged("source") ThisParameter this) {
+		// no content
+	}
+	void classTagged(@ClassTagged("class") ThisParameter this) {
+		// no content
+	}
+	void runtimeTagged(@RuntimeTagged("runtime") ThisParameter this) {
+		// no content
+	}
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.SOURCE)
+	@interface SourceTagged {
+		String value();
+	}
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.CLASS)
+	@interface ClassTagged {
+		String value();
+	}
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.RUNTIME)
+	@interface RuntimeTagged {
+		String value();
+	}
+}
diff --git a/test/pretty/resource/before/ThisParameter.java b/test/pretty/resource/before/ThisParameter.java
new file mode 100644
index 00000000..d95c0261
--- /dev/null
+++ b/test/pretty/resource/before/ThisParameter.java
@@ -0,0 +1,41 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+class ThisParameter {
+	
+	void untagged(ThisParameter this, int i) {
+		// no content
+	}
+	
+	void sourceTagged(@SourceTagged("source") ThisParameter this) {
+		// no content
+	}
+	
+	void classTagged(@ClassTagged("class") ThisParameter this) {
+		// no content
+	}	
+	
+	void runtimeTagged(@RuntimeTagged("runtime") ThisParameter this) {
+		// no content
+	}
+	
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.SOURCE)
+	@interface SourceTagged {
+		String value();
+	}
+	
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.CLASS)
+	@interface ClassTagged {
+		String value();
+	}
+	
+	@Target(ElementType.PARAMETER)
+	@Retention(RetentionPolicy.RUNTIME)
+	@interface RuntimeTagged {
+		String value();
+	}
+}