From 1f0db1191a7fcc35aaeab1481a806201a450d797 Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Sun, 7 Nov 2010 02:49:01 +0100
Subject: Use the actual annotation value to process the @Log annotations
 instead of their String representations.

---
 test/transform/resource/after-delombok/LoggerSlf4j.java           | 2 +-
 .../resource/after-delombok/LoggerSlf4jClassOfArray.java          | 3 +++
 test/transform/resource/after-delombok/LoggerSlf4jTypes.java      | 2 +-
 test/transform/resource/after-delombok/LoggerSlf4jWithClass.java  | 2 +-
 .../transform/resource/after-delombok/LoggerSlf4jWithPackage.java | 4 ++--
 test/transform/resource/after-ecj/LoggerSlf4j.java                | 2 +-
 test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java    | 8 ++++++++
 test/transform/resource/after-ecj/LoggerSlf4jTypes.java           | 2 +-
 test/transform/resource/after-ecj/LoggerSlf4jWithClass.java       | 2 +-
 test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java     | 4 ++--
 test/transform/resource/before/LoggerSlf4jClassOfArray.java       | 3 +++
 11 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/transform/resource/after-delombok/LoggerSlf4j.java b/test/transform/resource/after-delombok/LoggerSlf4j.java
index dae17826..c7c84631 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4j.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4j.java
@@ -3,6 +3,6 @@ class LoggerSlf4j {
 }
 class LoggerSlf4jOuter {
 	static class Inner {
-		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOuter.Inner.class);
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java
index bcae2741..00b44d5c 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jClassOfArray.java
@@ -1,3 +1,6 @@
 class LoggerSlf4jClassOfArray {
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(String[].class);
 }
+class LoggerSlf4jClassOfArrayJLS {
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String[].class);
+}
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
index 539f46d6..4950bc88 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jTypes.java
@@ -12,6 +12,6 @@ enum LoggerSlf4jTypesEnumWithElement {
 }
 interface LoggerSlf4jTypesInterfaceOuter {
 	class Inner {
-		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesInterfaceOuter.Inner.class);
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java b/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java
index 5908d374..b4e2181e 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jWithClass.java
@@ -8,5 +8,5 @@ class LoggerSlf4jWithClassValue {
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String.class);
 }
 class LoggerSlf4jWithClassVoid {
-	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithClassVoid.class);
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(void.class);
 }
diff --git a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
index 516f858f..b337bd02 100644
--- a/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
+++ b/test/transform/resource/after-delombok/LoggerSlf4jWithPackage.java
@@ -1,9 +1,9 @@
 package before;
 class LoggerSlf4jWithPackage {
-	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackage.class);
+	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class);
 }
 class LoggerSlf4jWithPackageOuter {
 	static class Inner {
-		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackageOuter.Inner.class);
+		private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
 	}
 }
diff --git a/test/transform/resource/after-ecj/LoggerSlf4j.java b/test/transform/resource/after-ecj/LoggerSlf4j.java
index 24682e97..e635ece8 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4j.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4j.java
@@ -8,7 +8,7 @@
 }
 class LoggerSlf4jOuter {
   static @lombok.extern.slf4j.Log class Inner {
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOuter.Inner.class);
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
     <clinit>() {
     }
     Inner() {
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java
index a3dad07b..20fe0fde 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jClassOfArray.java
@@ -5,4 +5,12 @@
   LoggerSlf4jClassOfArray() {
     super();
   }
+}
+@lombok.extern.slf4j.Log(java.lang.String[].class) class LoggerSlf4jClassOfArrayJLS {
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(java.lang.String[].class);
+  <clinit>() {
+  }
+  LoggerSlf4jClassOfArrayJLS() {
+    super();
+  }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java
index 74214cc4..25b3fd86 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jTypes.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jTypes.java
@@ -21,7 +21,7 @@
 }
 interface LoggerSlf4jTypesInterfaceOuter {
   @lombok.extern.slf4j.Log class Inner {
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesInterfaceOuter.Inner.class);
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
     <clinit>() {
     }
     Inner() {
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java
index 920f84e4..9f4846aa 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jWithClass.java
@@ -23,7 +23,7 @@
   }
 }
 @lombok.extern.slf4j.Log(void.class) class LoggerSlf4jWithClassVoid {
-  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithClassVoid.class);
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(void.class);
   <clinit>() {
   }
   LoggerSlf4jWithClassVoid() {
diff --git a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java
index d56db764..655d14f8 100644
--- a/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java
+++ b/test/transform/resource/after-ecj/LoggerSlf4jWithPackage.java
@@ -1,6 +1,6 @@
 package before;
 @lombok.extern.slf4j.Log class LoggerSlf4jWithPackage {
-  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackage.class);
+  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class);
   <clinit>() {
   }
   LoggerSlf4jWithPackage() {
@@ -9,7 +9,7 @@ package before;
 }
 class LoggerSlf4jWithPackageOuter {
   static @lombok.extern.slf4j.Log class Inner {
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(before.LoggerSlf4jWithPackageOuter.Inner.class);
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
     <clinit>() {
     }
     Inner() {
diff --git a/test/transform/resource/before/LoggerSlf4jClassOfArray.java b/test/transform/resource/before/LoggerSlf4jClassOfArray.java
index f18e11f0..87248538 100644
--- a/test/transform/resource/before/LoggerSlf4jClassOfArray.java
+++ b/test/transform/resource/before/LoggerSlf4jClassOfArray.java
@@ -1,3 +1,6 @@
 @lombok.extern.slf4j.Log(String[].class)
 class LoggerSlf4jClassOfArray {
 }
+@lombok.extern.slf4j.Log(java.lang.String[].class)
+class LoggerSlf4jClassOfArrayJLS {
+}
-- 
cgit