[deps] Updated eclipse deps to 3.9 tree. This also enables testing java7 features on ecj.

[Log] updated naming for @Log (topic= instead of mchmulder's 'value').

21 files changed, 70 insertions, 31 deletions

diff --git a/test/core/src/lombok/AbstractRunTests.java b/test/core/src/lombok/AbstractRunTests.java
index 2f3f0988..e84aec0d 100644
--- a/test/core/src/lombok/AbstractRunTests.java
+++ b/test/core/src/lombok/AbstractRunTests.java
@@ -225,8 +225,8 @@ public abstract class AbstractRunTests {
 		actualLines = removeBlanks(actualLines);
 		int size = Math.min(expectedLines.length, actualLines.length);
 		for (int i = 0; i < size; i++) {
-			String expected = expectedLines[i];
-			String actual = actualLines[i];
+			String expected = trimRight(expectedLines[i]);
+			String actual = trimRight(actualLines[i]);
 			assertEquals(String.format("Difference in %s on line %d", name, i + 1), expected, actual);
 		}
 		if (expectedLines.length > actualLines.length) {
@@ -237,6 +237,15 @@ public abstract class AbstractRunTests {
 		}
 	}
 	
+	private static String trimRight(String in) {
+		int endIdx = in.length() - 1;
+		while (endIdx > -1 && Character.isWhitespace(in.charAt(endIdx))) {
+			endIdx--;
+		}
+		
+		return in.substring(0, endIdx);
+	}
+	
 	private static String[] removeBlanks(String[] in) {
 		List<String> out = new ArrayList<String>();
 		for (String s : in) {
diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java
index 586c124a..4f3e2794 100644
--- a/test/core/src/lombok/RunTestsViaEcj.java
+++ b/test/core/src/lombok/RunTestsViaEcj.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 The Project Lombok Authors.
+ * Copyright (C) 2010-2014 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -70,6 +70,7 @@ public class RunTestsViaEcj extends AbstractRunTests {
 		warnings.put(CompilerOptions.OPTION_ReportUnusedLabel, "ignore");
 		warnings.put(CompilerOptions.OPTION_ReportUnusedImport, "ignore");
 		warnings.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, "ignore");
+		warnings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7);
 		options.set(warnings);
 		return options;
 	}
diff --git a/test/transform/resource/after-ecj/LoggerCommons.java b/test/transform/resource/after-ecj/LoggerCommons.java
index 50d07a14..df102a12 100644
--- a/test/transform/resource/after-ecj/LoggerCommons.java
+++ b/test/transform/resource/after-ecj/LoggerCommons.java
@@ -15,7 +15,7 @@ import lombok.extern.apachecommons.CommonsLog;
     super();
   }
 }
-@CommonsLog("DifferentName") class LoggerCommonsWithDifferentName {
+@CommonsLog(topic = "DifferentName") class LoggerCommonsWithDifferentName {
   private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog("DifferentName");
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerJul.java b/test/transform/resource/after-ecj/LoggerJul.java
index 3aa8181d..8aa4f59a 100644
--- a/test/transform/resource/after-ecj/LoggerJul.java
+++ b/test/transform/resource/after-ecj/LoggerJul.java
@@ -15,7 +15,7 @@ import lombok.extern.java.Log;
     super();
   }
 }
-@Log("DifferentName") class LoggerJulWithDifferentName {
+@Log(topic = "DifferentName") class LoggerJulWithDifferentName {
   private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("DifferentName");
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerLog4j.java b/test/transform/resource/after-ecj/LoggerLog4j.java
index a6c52d61..948412e2 100644
--- a/test/transform/resource/after-ecj/LoggerLog4j.java
+++ b/test/transform/resource/after-ecj/LoggerLog4j.java
@@ -15,7 +15,7 @@ import lombok.extern.log4j.Log4j;
     super();
   }
 }
-@Log4j("DifferentName") class LoggerLog4jWithDifferentName {
+@Log4j(topic = "DifferentName") class LoggerLog4jWithDifferentName {
   private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("DifferentName");
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerLog4j2.java b/test/transform/resource/after-ecj/LoggerLog4j2.java
index 3243ef2d..c2fcd428 100644
--- a/test/transform/resource/after-ecj/LoggerLog4j2.java
+++ b/test/transform/resource/after-ecj/LoggerLog4j2.java
@@ -15,7 +15,7 @@ import lombok.extern.log4j.Log4j2;
     super();
   }
 }
-@Log4j2("DifferentName") class LoggerLog4j2WithDifferentName {
+@Log4j2(topic = "DifferentName") class LoggerLog4j2WithDifferentName {
   private static final org.apache.logging.log4j.Logger log = org.apache.logging.log4j.LogManager.getLogger("DifferentName");
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerSlf4j.java b/test/transform/resource/after-ecj/LoggerSlf4j.java
index a34f85d7..9c5405cb 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4j.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4j.java
@@ -29,7 +29,7 @@ class LoggerSlf4jOuter {
   }
 }
 
-@Slf4j("DifferentLogger") class LoggerSlf4jWithDifferentLoggerName {
+@Slf4j(topic = "DifferentLogger") class LoggerSlf4jWithDifferentLoggerName {
   private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("DifferentLogger");
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/LoggerXSlf4j.java b/test/transform/resource/after-ecj/LoggerXSlf4j.java
index 4cd4cb94..916859a4 100644
--- a/test/transform/resource/after-ecj/LoggerXSlf4j.java
+++ b/test/transform/resource/after-ecj/LoggerXSlf4j.java
@@ -15,7 +15,7 @@ import lombok.extern.slf4j.XSlf4j;
     super();
   }
 }
-@XSlf4j("DifferentName") class LoggerXSlf4jWithDifferentName {
+@XSlf4j(topic = "DifferentName") class LoggerXSlf4jWithDifferentName {
   private static final org.slf4j.ext.XLogger log = org.slf4j.ext.XLoggerFactory.getXLogger("DifferentName");
   <clinit>() {
   }
diff --git a/test/transform/resource/after-ecj/NonNullWithSneakyThrows.java b/test/transform/resource/after-ecj/NonNullWithSneakyThrows.java
index fac8dcdd..1a57be29 100644
--- a/test/transform/resource/after-ecj/NonNullWithSneakyThrows.java
+++ b/test/transform/resource/after-ecj/NonNullWithSneakyThrows.java
@@ -11,7 +11,8 @@ class NonNullWithSneakyThrows {
             }
         System.out.println(in);
       }
-    catch (final java.lang.Throwable $ex)       {
+    catch (final java.lang.Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
diff --git a/test/transform/resource/after-ecj/SneakyThrowsMultiple.java b/test/transform/resource/after-ecj/SneakyThrowsMultiple.java
index 82eda411..65862c2b 100644
--- a/test/transform/resource/after-ecj/SneakyThrowsMultiple.java
+++ b/test/transform/resource/after-ecj/SneakyThrowsMultiple.java
@@ -13,11 +13,13 @@ class SneakyThrowsMultiple {
             System.out.println("test1");
             throw new IOException();
           }
-        catch (final IOException $ex)           {
+        catch (final IOException $ex)
+          {
             throw lombok.Lombok.sneakyThrow($ex);
           }
       }
-    catch (final Throwable $ex)       {
+    catch (final Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -36,11 +38,13 @@ class SneakyThrowsMultiple {
                   throw new AWTException("WHAT");
                 }
           }
-        catch (final AWTException $ex)           {
+        catch (final AWTException $ex)
+          {
             throw lombok.Lombok.sneakyThrow($ex);
           }
       }
-    catch (final IOException $ex)       {
+    catch (final IOException $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -52,11 +56,13 @@ class SneakyThrowsMultiple {
             System.out.println("test3");
             throw new IOException();
           }
-        catch (final IOException $ex)           {
+        catch (final IOException $ex)
+          {
             throw lombok.Lombok.sneakyThrow($ex);
           }
       }
-    catch (final Throwable $ex)       {
+    catch (final Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
diff --git a/test/transform/resource/after-ecj/SneakyThrowsPlain.java b/test/transform/resource/after-ecj/SneakyThrowsPlain.java
index 1b45dc5a..df436891 100644
--- a/test/transform/resource/after-ecj/SneakyThrowsPlain.java
+++ b/test/transform/resource/after-ecj/SneakyThrowsPlain.java
@@ -6,7 +6,8 @@ class SneakyThrowsPlain {
       {
         System.out.println("constructor");
       }
-    catch (final java.lang.Throwable $ex)       {
+    catch (final java.lang.Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -16,7 +17,8 @@ class SneakyThrowsPlain {
       {
         System.out.println("constructor2");
       }
-    catch (final java.lang.Throwable $ex)       {
+    catch (final java.lang.Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -25,7 +27,8 @@ class SneakyThrowsPlain {
       {
         System.out.println("test1");
       }
-    catch (final java.lang.Throwable $ex)       {
+    catch (final java.lang.Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -34,7 +37,8 @@ class SneakyThrowsPlain {
       {
         System.out.println("test2");
       }
-    catch (final java.lang.Throwable $ex)       {
+    catch (final java.lang.Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
diff --git a/test/transform/resource/after-ecj/SneakyThrowsSingle.java b/test/transform/resource/after-ecj/SneakyThrowsSingle.java
index eea593f2..073d690a 100644
--- a/test/transform/resource/after-ecj/SneakyThrowsSingle.java
+++ b/test/transform/resource/after-ecj/SneakyThrowsSingle.java
@@ -8,7 +8,8 @@ class SneakyThrowsSingle {
       {
         System.out.println("test1");
       }
-    catch (final Throwable $ex)       {
+    catch (final Throwable $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -18,7 +19,8 @@ class SneakyThrowsSingle {
         System.out.println("test2");
         throw new IOException();
       }
-    catch (final IOException $ex)       {
+    catch (final IOException $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
@@ -28,7 +30,8 @@ class SneakyThrowsSingle {
         System.out.println("test3");
         throw new IOException();
       }
-    catch (final IOException $ex)       {
+    catch (final IOException $ex)
+      {
         throw lombok.Lombok.sneakyThrow($ex);
       }
   }
diff --git a/test/transform/resource/after-ecj/ValComplex.java b/test/transform/resource/after-ecj/ValComplex.java
index 6e435e56..746e3088 100644
--- a/test/transform/resource/after-ecj/ValComplex.java
+++ b/test/transform/resource/after-ecj/ValComplex.java
@@ -16,7 +16,7 @@ public class ValComplex {
         final @val int field = 20;
         final @val int inner = 10;
         switch (field) {
-        case 5 : ;
+        case 5 :
             final @val char[] shouldBeCharArray2 = shouldBeCharArray;
             final @val int innerInner = inner;
         }
diff --git a/test/transform/resource/after-ecj/ValInTryWithResources.java b/test/transform/resource/after-ecj/ValInTryWithResources.java
new file mode 100644
index 00000000..a532d48c
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValInTryWithResources.java
@@ -0,0 +1,14 @@
+import lombok.val;
+import java.io.IOException;
+public class ValInTryWithResources {
+  public ValInTryWithResources() {
+    super();
+  }
+  public void whyTryInsteadOfCleanup() throws IOException {
+    try (final @val java.io.InputStream in = getClass().getResourceAsStream("ValInTryWithResources.class"))
+      {
+        final @val java.io.InputStream i = in;
+        final @val int j = in.read();
+      }
+  }
+}
diff --git a/test/transform/resource/after-ecj/ValLessSimple.java b/test/transform/resource/after-ecj/ValLessSimple.java
index c7587f91..28772d68 100644
--- a/test/transform/resource/after-ecj/ValLessSimple.java
+++ b/test/transform/resource/after-ecj/ValLessSimple.java
@@ -32,7 +32,8 @@ public class ValLessSimple {
       {
         final @val int x = (1 / 0);
       }
-    catch (ArithmeticException e)       {
+    catch (ArithmeticException e)
+      {
         final @val int y = 0;
       }
   }
diff --git a/test/transform/resource/before/LoggerCommons.java b/test/transform/resource/before/LoggerCommons.java
index ce9e4ec4..00419d00 100644
--- a/test/transform/resource/before/LoggerCommons.java
+++ b/test/transform/resource/before/LoggerCommons.java
@@ -8,6 +8,6 @@ class LoggerCommons {
 class LoggerCommonsWithImport {
 }
 
-@CommonsLog("DifferentName")
+@CommonsLog(topic="DifferentName")
 class LoggerCommonsWithDifferentName {
 }
diff --git a/test/transform/resource/before/LoggerJul.java b/test/transform/resource/before/LoggerJul.java
index 41e36220..006cc344 100644
--- a/test/transform/resource/before/LoggerJul.java
+++ b/test/transform/resource/before/LoggerJul.java
@@ -8,6 +8,6 @@ class LoggerJul {
 class LoggerJulWithImport {
 }
 
-@Log("DifferentName")
+@Log(topic="DifferentName")
 class LoggerJulWithDifferentName {
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerLog4j.java b/test/transform/resource/before/LoggerLog4j.java
index fa7dad4a..351049c5 100644
--- a/test/transform/resource/before/LoggerLog4j.java
+++ b/test/transform/resource/before/LoggerLog4j.java
@@ -8,6 +8,6 @@ class LoggerLog4j {
 class LoggerLog4jWithImport {
 }
 
-@Log4j("DifferentName")
+@Log4j(topic="DifferentName")
 class LoggerLog4jWithDifferentName {
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerLog4j2.java b/test/transform/resource/before/LoggerLog4j2.java
index 13b3605f..c9cf9412 100644
--- a/test/transform/resource/before/LoggerLog4j2.java
+++ b/test/transform/resource/before/LoggerLog4j2.java
@@ -8,6 +8,6 @@ class LoggerLog4j2 {
 class LoggerLog4j2WithImport {
 }
 
-@Log4j2("DifferentName")
+@Log4j2(topic="DifferentName")
 class LoggerLog4j2WithDifferentName {
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerSlf4j.java b/test/transform/resource/before/LoggerSlf4j.java
index b620e056..1113a63e 100644
--- a/test/transform/resource/before/LoggerSlf4j.java
+++ b/test/transform/resource/before/LoggerSlf4j.java
@@ -15,6 +15,6 @@ class LoggerSlf4jOuter {
 	}
 }
 
-@Slf4j("DifferentLogger")
+@Slf4j(topic="DifferentLogger")
 class LoggerSlf4jWithDifferentLoggerName {
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/LoggerXSlf4j.java b/test/transform/resource/before/LoggerXSlf4j.java
index 408bd134..a8bcb0c3 100644
--- a/test/transform/resource/before/LoggerXSlf4j.java
+++ b/test/transform/resource/before/LoggerXSlf4j.java
@@ -8,6 +8,6 @@ class LoggerXSlf4j {
 class LoggerXSlf4jWithImport {
 }
 
-@XSlf4j("DifferentName")
+@XSlf4j(topic="DifferentName")
 class LoggerXSlf4jWithDifferentName {
 }
\ No newline at end of file