From 04e9397971d3689e0710df026f673f8b0a6cb685 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Fri, 18 Mar 2011 19:30:02 +0100
Subject: Rewritten @Cleanup's new null analysis prevention to not use
 Lombok.preventNullAnalysis but go with Collections.singletonList(expr).get(0)
 instead; while this does create a pointless object, it doesn't cause a clash
 when eclipse has lombok 0.10 installed but the project uses 0.9, which
 doesn't have preventNullAnalysis. Eventually, once 0.9 is long forgotten,
 this can be reverted.

---
 test/transform/resource/after-delombok/CleanupName.java  | 4 ++--
 test/transform/resource/after-delombok/CleanupPlain.java | 4 ++--
 test/transform/resource/after-ecj/CleanupName.java       | 4 ++--
 test/transform/resource/after-ecj/CleanupPlain.java      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/transform/resource/after-delombok/CleanupName.java b/test/transform/resource/after-delombok/CleanupName.java
index 37a8d117..a4ab8267 100644
--- a/test/transform/resource/after-delombok/CleanupName.java
+++ b/test/transform/resource/after-delombok/CleanupName.java
@@ -4,7 +4,7 @@ class CleanupName {
 		try {
 			System.out.println(o);
 		} finally {
-			if (lombok.Lombok.preventNullAnalysis(o) != null) {
+			if (java.util.Collections.singletonList(o).get(0) != null) {
 				o.toString();
 			}
 		}
@@ -14,7 +14,7 @@ class CleanupName {
 		try {
 			System.out.println(o);
 		} finally {
-			if (lombok.Lombok.preventNullAnalysis(o) != null) {
+			if (java.util.Collections.singletonList(o).get(0) != null) {
 				o.toString();
 			}
 		}
diff --git a/test/transform/resource/after-delombok/CleanupPlain.java b/test/transform/resource/after-delombok/CleanupPlain.java
index 67c82f60..f91f35ee 100644
--- a/test/transform/resource/after-delombok/CleanupPlain.java
+++ b/test/transform/resource/after-delombok/CleanupPlain.java
@@ -9,12 +9,12 @@ class CleanupPlain {
 					out.flush();
 				}
 			} finally {
-				if (lombok.Lombok.preventNullAnalysis(out) != null) {
+				if (java.util.Collections.singletonList(out).get(0) != null) {
 					out.close();
 				}
 			}
 		} finally {
-			if (lombok.Lombok.preventNullAnalysis(in) != null) {
+			if (java.util.Collections.singletonList(in).get(0) != null) {
 				in.close();
 			}
 		}
diff --git a/test/transform/resource/after-ecj/CleanupName.java b/test/transform/resource/after-ecj/CleanupName.java
index 8948e91d..f3f725f2 100644
--- a/test/transform/resource/after-ecj/CleanupName.java
+++ b/test/transform/resource/after-ecj/CleanupName.java
@@ -10,7 +10,7 @@ class CleanupName {
       }
     finally
       {
-        if ((lombok.Lombok.preventNullAnalysis(o) != null))
+        if ((java.util.Collections.singletonList(o).get(0) != null))
             {
               o.toString();
             }
@@ -24,7 +24,7 @@ class CleanupName {
       }
     finally
       {
-        if ((lombok.Lombok.preventNullAnalysis(o) != null))
+        if ((java.util.Collections.singletonList(o).get(0) != null))
             {
               o.toString();
             }
diff --git a/test/transform/resource/after-ecj/CleanupPlain.java b/test/transform/resource/after-ecj/CleanupPlain.java
index 6eaa4377..a9b9eceb 100644
--- a/test/transform/resource/after-ecj/CleanupPlain.java
+++ b/test/transform/resource/after-ecj/CleanupPlain.java
@@ -18,7 +18,7 @@ class CleanupPlain {
           }
         finally
           {
-            if ((lombok.Lombok.preventNullAnalysis(out) != null))
+            if ((java.util.Collections.singletonList(out).get(0) != null))
                 {
                   out.close();
                 }
@@ -26,7 +26,7 @@ class CleanupPlain {
       }
     finally
       {
-        if ((lombok.Lombok.preventNullAnalysis(in) != null))
+        if ((java.util.Collections.singletonList(in).get(0) != null))
             {
               in.close();
             }
-- 
cgit