Merge branch 'master' of github.com:rzwitserloot/lombok

Conflicts:
	src/delombok/lombok/delombok/DelombokApp.java

1 files changed, 0 insertions, 9 deletions

diff --git a/test/transform/resource/after-delombok/NonNullPlain.java b/test/transform/resource/after-delombok/NonNullPlain.java
index 6b85cbf7..b7d27ef3 100644
--- a/test/transform/resource/after-delombok/NonNullPlain.java
+++ b/test/transform/resource/after-delombok/NonNullPlain.java
@@ -1,5 +1,4 @@
 import java.lang.annotation.*;
-
 class NonNullPlain {
 	@lombok.NonNull
 	int i;
@@ -7,12 +6,10 @@ class NonNullPlain {
 	String s;
 	@NotNull
 	Object o;
-	
 	@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
 	@Retention(RetentionPolicy.CLASS)
 	public @interface NotNull {
 	}
-	
 	@java.beans.ConstructorProperties({"i", "s"})
 	@java.lang.SuppressWarnings("all")
 	public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) {
@@ -22,29 +19,24 @@ class NonNullPlain {
 		this.i = i;
 		this.s = s;
 	}
-	
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
 	public int getI() {
 		return this.i;
 	}
-	
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
 	public String getS() {
 		return this.s;
 	}
-	
 	@java.lang.SuppressWarnings("all")
 	public Object getO() {
 		return this.o;
 	}
-	
 	@java.lang.SuppressWarnings("all")
 	public void setI(@lombok.NonNull final int i) {
 		this.i = i;
 	}
-	
 	@java.lang.SuppressWarnings("all")
 	public void setS(@lombok.NonNull final String s) {
 		if (s == null) {
@@ -52,7 +44,6 @@ class NonNullPlain {
 		}
 		this.s = s;
 	}
-	
 	@java.lang.SuppressWarnings("all")
 	public void setO(final Object o) {
 		this.o = o;