[waffle-scm] [783] trunk/waffle-core: upgrade to pico 2.5.1 + fixed waffle Startable use for Ruby example

Mon, 25 Aug 2008 21:53:43 -0700

Title: [waffle-scm] [783] trunk/waffle-core: upgrade to pico 2.5.1 + fixed waffle Startable use for Ruby example

Diff

Modified: trunk/waffle-core/pom.xml (782 => 783)

--- trunk/waffle-core/pom.xml	2008-08-21 10:17:32 UTC (rev 782)
+++ trunk/waffle-core/pom.xml	2008-08-26 03:45:48 UTC (rev 783)
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.picocontainer</groupId>
       <artifactId>picocontainer</artifactId>
-      <version>2.4</version>
+      <version>2.5.1</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameter.java (782 => 783)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameter.java	2008-08-21 10:17:32 UTC (rev 782)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameter.java	2008-08-26 03:45:48 UTC (rev 783)
@@ -10,6 +10,7 @@
 import org.picocontainer.PicoVisitor;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 
 /**
  * A base for Waffle's implementation of PicoContainer Parameter.
@@ -27,12 +28,11 @@
         return key;
     }
 
-    public boolean isResolvable(PicoContainer picoContainer, ComponentAdapter componentAdapter, Class clazz, NameBinding nameBinding, boolean b, Annotation annotation) {
-        return resolveInstance(picoContainer, componentAdapter, clazz, nameBinding, b, annotation) != null;
+    public boolean isResolvable(PicoContainer picoContainer, ComponentAdapter<?> componentAdapter, Type type, NameBinding nameBinding, boolean b, Annotation annotation) {
+        return resolveInstance(picoContainer, componentAdapter, type, nameBinding, b, annotation) != null;
     }
 
-    public void verify(PicoContainer picoContainer, ComponentAdapter componentAdapter, Class aClass, NameBinding nameBinding, boolean b, Annotation annotation) {
-        // do nothing
+    public void verify(PicoContainer picoContainer, ComponentAdapter<?> componentAdapter, Type type, NameBinding nameBinding, boolean b, Annotation annotation) {
     }
 
     public void accept(PicoVisitor picoVisitor) {

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/RequestAttributeParameter.java (782 => 783)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/RequestAttributeParameter.java	2008-08-21 10:17:32 UTC (rev 782)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/RequestAttributeParameter.java	2008-08-26 03:45:48 UTC (rev 783)
@@ -9,6 +9,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 
 /**
  * Will resolve value from the [EMAIL PROTECTED] HttpServletRequest} attribute.
@@ -22,13 +23,14 @@
     }
 
     @SuppressWarnings({"unchecked"})
-    public <T> T resolveInstance(PicoContainer picoContainer,
-                                 ComponentAdapter componentAdapter,
-                                 Class<T> clazz,
+    public Object resolveInstance(PicoContainer picoContainer,
+                                 ComponentAdapter<?> componentAdapter,
+                                 Type type,
                                  NameBinding nameBinding,
                                  boolean b,
                                  Annotation annotation) {
         HttpServletRequest request = picoContainer.getComponent(HttpServletRequest.class);
-        return (T) request.getAttribute(getKey());
+        return request.getAttribute(getKey());
     }
+
 }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/RequestParameterParameter.java (782 => 783)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/RequestParameterParameter.java	2008-08-21 10:17:32 UTC (rev 782)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/RequestParameterParameter.java	2008-08-26 03:45:48 UTC (rev 783)
@@ -10,6 +10,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 
 /**
  * This class is dependent on <code>StringTransmuter</code> so that a parameter value can
@@ -30,16 +31,16 @@
 
 
     @SuppressWarnings({"unchecked"})
-    public <T> T resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Class<T> expectedType, NameBinding nameBinding, boolean b, Annotation annotation) {
+    public Object resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Type expectedType, NameBinding nameBinding, boolean b, Annotation annotation) {
         HttpServletRequest request = picoContainer
                 .getComponent(HttpServletRequest.class);
         String value = request.getParameter(getKey());
         Object result = stringTransmuter.transmute(value, expectedType);
 
         if(result == null) {
-            return (T) defaultValue;
+            return defaultValue;
         }
 
-        return (T) result;
+        return result;
     }
 }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/ServletContextAttributeParameter.java (782 => 783)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/ServletContextAttributeParameter.java	2008-08-21 10:17:32 UTC (rev 782)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/ServletContextAttributeParameter.java	2008-08-26 03:45:48 UTC (rev 783)
@@ -9,6 +9,7 @@
 
 import javax.servlet.ServletContext;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 
 /**
  * Will resolve value from the [EMAIL PROTECTED] ServletContext} attribute.
@@ -22,13 +23,13 @@
     }
 
     @SuppressWarnings({"unchecked"})
-    public <T> T resolveInstance(PicoContainer picoContainer,
+    public Object resolveInstance(PicoContainer picoContainer,
                                  ComponentAdapter componentAdapter,
-                                 Class<T> clazz,
+                                 Type type,
                                  NameBinding nameBinding,
                                  boolean b,
                                  Annotation annotation) {
         ServletContext servletContext = picoContainer.getComponent(ServletContext.class);
-        return (T) servletContext.getAttribute(getKey());
+        return servletContext.getAttribute(getKey());
     }
 }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameter.java (782 => 783)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameter.java	2008-08-21 10:17:32 UTC (rev 782)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/registrar/pico/SessionAttributeParameter.java	2008-08-26 03:45:48 UTC (rev 783)
@@ -9,6 +9,7 @@
 
 import javax.servlet.http.HttpSession;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 
 /**
  * Will resolve value from the [EMAIL PROTECTED] HttpSession} attribute.
@@ -22,13 +23,13 @@
     }
 
     @SuppressWarnings({"unchecked"})
-    public <T> T resolveInstance(PicoContainer picoContainer,
+    public Object resolveInstance(PicoContainer picoContainer,
                                  ComponentAdapter componentAdapter,
-                                 Class<T> clazz,
+                                 Type type,
                                  NameBinding nameBinding,
                                  boolean b,
                                  Annotation annotation) {
         HttpSession session = picoContainer.getComponent(HttpSession.class);
-        return (T) session.getAttribute(getKey());
+        return session.getAttribute(getKey());
     }
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameterTest.java (782 => 783)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameterTest.java	2008-08-21 10:17:32 UTC (rev 782)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameterTest.java	2008-08-26 03:45:48 UTC (rev 783)
@@ -11,6 +11,7 @@
 import org.picocontainer.NameBinding;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 
 /**
  * 
@@ -27,7 +28,7 @@
         final AbstractWaffleParameter parameter = new AbstractWaffleParameter("foobar") {
 
             @SuppressWarnings("unchecked")
-            public <T> T resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Class<T> tClass, NameBinding nameBinding, boolean b, Annotation annotation) {
+            public Object resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Type type, NameBinding nameBinding, boolean b, Annotation annotation) {
                 throw new UnsupportedOperationException("don't call");
             }
         };

Modified: trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyScriptLoader.java (782 => 783)

--- trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyScriptLoader.java	2008-08-21 10:17:32 UTC (rev 782)
+++ trunk/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyScriptLoader.java	2008-08-26 03:45:48 UTC (rev 783)
@@ -6,7 +6,7 @@
 import org.jruby.Ruby;
 import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.picocontainer.Startable;
+import org.codehaus.waffle.Startable;
 
 import javax.servlet.ServletContext;

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to