[google-guice] r1324 committed - fix Nullability to check for "$Nullable" (the jarjar renamed "Nullable...

[google-guice]

Revision: 1324
Author: sberlin
Date: Tue Oct 26 19:40:07 2010
Log: fix Nullability to check for "$Nullable" (the jarjar  
renamed "Nullable"), and fix jarjar to build using asm-3.3 (it was using  
3.1, and using 3.3 fixes  
http://code.google.com/p/jarjar/issues/detail?id=21, where annotations on  
methods that are remapped are loss)
http://code.google.com/p/google-guice/source/detail?r=1324
Added:
 /trunk/lib/build/jarjar-snapshot.jar
Deleted:
 /trunk/lib/build/jarjar-1.0rc8.jar
Modified:
 /trunk/common.xml
 /trunk/core/src/com/google/inject/internal/Nullability.java

=======================================
--- /dev/null   
+++ /trunk/lib/build/jarjar-snapshot.jar        Tue Oct 26 19:40:07 2010
Binary file, no diff available.
=======================================
--- /trunk/lib/build/jarjar-1.0rc8.jar  Sat Sep 13 14:02:12 2008
+++ /dev/null   
Binary file, no diff available.
=======================================
--- /trunk/common.xml   Tue Oct 26 18:48:00 2010
+++ /trunk/common.xml   Tue Oct 26 19:40:07 2010
@@ -118,7 +118,7 @@
        <mkdir dir="${build.dir}/dist"/>
     <dirname property="common.basedir" file="${ant.file.common}"/>
     <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-        classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/>
+        classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/>
     <jarjar  
jarfile="${build.dir}/${ant.project.name}-${version}-tests.jar">
       <fileset dir="${build.dir}/test"/>
       <rule pattern="com.google.inject.internal.util.*"  
result="com.google.inject.internal.uti...@1"/>
@@ -133,7 +133,7 @@
     <mkdir dir="${build.dir}/dist"/>
     <dirname property="common.basedir" file="${ant.file.common}"/>
     <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-        classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/>
+        classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/>
     <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
       <fileset dir="${build.dir}/classes"/>
       <zipfileset  
src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
=======================================
--- /trunk/core/src/com/google/inject/internal/Nullability.java	Sun Jun 15  
04:21:18 2008
+++ /trunk/core/src/com/google/inject/internal/Nullability.java	Tue Oct 26  
19:40:07 2010
@@ -22,7 +22,9 @@

   public static boolean allowsNull(Annotation[] annotations) {
     for(Annotation a : annotations) {
-      if ("Nullable".equals(a.annotationType().getSimpleName())) {
+      String name = a.annotationType().getSimpleName();
+      // Check for $Nullable also because jarjar renames it.
+      if ("Nullable".equals(name) || "$Nullable".equals(name)) {
         return true;
       }
     }

--
You received this message because you are subscribed to the Google Groups 
"google-guice-dev" group.
To post to this group, send email to google-guice-...@googlegroups.com.
To unsubscribe from this group, send email to 
google-guice-dev+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/google-guice-dev?hl=en.