From c864c8fa2db13e86f6531b2398fee99e5901d583 Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Thu, 15 Mar 2012 14:25:42 +1100
Subject: [PATCH 1/2] Fix compilation problem on JDK7

---
 .../weld/introspector/jlr/WeldAnnotationImpl.java  |    3 ++-
 .../org/jboss/weld/resources/ClassTransformer.java |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldAnnotationImpl.java b/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldAnnotationImpl.java
index 27fcb7f..316df10 100644
--- a/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldAnnotationImpl.java
+++ b/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldAnnotationImpl.java
@@ -51,7 +51,8 @@ public class WeldAnnotationImpl<T extends Annotation> extends WeldClassImpl<T> i
     // The set of abstracted members
     private final Set<WeldMethod<?, ?>> members;
 
-    public static <A extends Annotation> WeldAnnotation<A> of(Class<A> annotationType, ClassTransformer classTransformer) {
+    //we can't call this method 'of', cause it won't compile on JDK7
+    public static <A extends Annotation> WeldAnnotation<A> create(Class<A> annotationType, ClassTransformer classTransformer) {
         Map<Class<? extends Annotation>, Annotation> annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
         annotationMap.putAll(buildAnnotationMap(annotationType.getAnnotations()));
         annotationMap.putAll(buildAnnotationMap(classTransformer.getTypeStore().get(annotationType)));
diff --git a/impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java b/impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java
index 1ae346d..9e1dc06 100644
--- a/impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java
+++ b/impl/src/main/java/org/jboss/weld/resources/ClassTransformer.java
@@ -60,7 +60,7 @@ public class ClassTransformer implements Service {
         }
 
         public WeldAnnotation<?> apply(Class<? extends Annotation> from) {
-            return WeldAnnotationImpl.of(from, classTransformer);
+            return WeldAnnotationImpl.create(from, classTransformer);
         }
 
     }
-- 
1.7.9.3