[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tapestry-dev
Subject:    svn commit: r533425 - in /tapestry/tapestry4/trunk:
From:       jkuhnert () apache ! org
Date:       2007-04-28 21:04:03
Message-ID: 20070428210403.216391A9838 () eris ! apache ! org
[Download RAW message or body]

Author: jkuhnert
Date: Sat Apr 28 14:04:02 2007
New Revision: 533425

URL: http://svn.apache.org/viewvc?view=rev&rev=533425
Log:
Resolved TAPESTRY-1410 generics method signature parsing of return type.

Took out unneeded Locale.jwc spec file.

Removed:
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/component/Locale.jwc
 Modified:
    tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.application
  tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/component/Locale.java
  tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/GenericsMethodSignatureImpl.java


Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.application
                
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTrack \
er/src/context/WEB-INF/timetracker.application?view=diff&rev=533425&r1=533424&r2=533425
 ==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.application \
                (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/timetracker.application \
Sat Apr 28 14:04:02 2007 @@ -23,9 +23,12 @@
 
     <meta key="org.apache.tapestry.namespace-properties-name" value="messages" />
     <meta key="org.apache.tapestry.page-class-packages" \
value="org.apache.tapestry.timetracker.page"/> +    <meta \
key="org.apache.tapestry.component-class-packages" \
value="org.apache.tapestry.timetracker.component"/>  
     <library id="contrib" \
specification-path="classpath:/org/apache/tapestry/contrib/Contrib.library"/>  
+    <!--
     <component-type type="Locale" \
specification-path="classpath:/org/apache/tapestry/timetracker/component/Locale.jwc" \
/> +    -->
 
 </application>

Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/component/Locale.java
                
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTrack \
er/src/java/org/apache/tapestry/timetracker/component/Locale.java?view=diff&rev=533425&r1=533424&r2=533425
 ==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/component/Locale.java \
                (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/component/Locale.java \
Sat Apr 28 14:04:02 2007 @@ -3,11 +3,13 @@
 import org.apache.tapestry.AbstractComponent;
 import org.apache.tapestry.IMarkupWriter;
 import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.annotations.ComponentClass;
 import org.apache.tapestry.annotations.Parameter;
 
 /**
  *
  */
+@ComponentClass
 public abstract class Locale extends AbstractComponent {
 
     @Parameter(required = true)

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/GenericsMethodSignatureImpl.java
                
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java \
/org/apache/tapestry/enhance/GenericsMethodSignatureImpl.java?view=diff&rev=533425&r1=533424&r2=533425
 ==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/GenericsMethodSignatureImpl.java \
                (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/enhance/GenericsMethodSignatureImpl.java \
Sat Apr 28 14:04:02 2007 @@ -58,8 +58,6 @@
                     if (resolvedType != null)
                         return resolvedType;
                 }
-
-                return Void.TYPE;
             }
         }
 
@@ -69,7 +67,7 @@
     static Class findType(Type[] types, Class type)
     {
         for (int i = 0; i < types.length; i++) {
-
+            
             if (Class.class.isInstance(types[i]) && \
type.isAssignableFrom((Class)types[i]))  return (Class)types[i];
         }


[prev in list] [next in list] [prev in thread] [next in thread]