You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2011/07/23 18:57:06 UTC

svn commit: r1150144 - in /tapestry/tapestry5/trunk: plastic/src/main/java/org/apache/tapestry5/internal/plastic/ plastic/src/main/java/org/apache/tapestry5/plastic/ tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/

Author: hlship
Date: Sat Jul 23 16:57:06 2011
New Revision: 1150144

URL: http://svn.apache.org/viewvc?rev=1150144&view=rev
Log:
TAP5-1508: Add isVoid() to PlasticMethod

Modified:
    tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
    tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticMethod.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java

Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java?rev=1150144&r1=1150143&r2=1150144&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java (original)
+++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java Sat Jul 23 16:57:06 2011
@@ -190,6 +190,11 @@ public class PlasticClassImpl extends Lo
                     description.toShortString());
         }
 
+        public boolean isVoid()
+        {
+            return description.returnType.equals("void");
+        }
+
         public MethodHandle getHandle()
         {
             check();

Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticMethod.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticMethod.java?rev=1150144&r1=1150143&r2=1150144&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticMethod.java (original)
+++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticMethod.java Sat Jul 23 16:57:06 2011
@@ -115,4 +115,11 @@ public interface PlasticMethod extends A
      * @see org.apache.tapestry5.plastic.MethodDescription#toShortString()
      */
     String getMethodIdentifier();
+
+    /**
+     * Returns true if this method is type void.
+     *
+     * @return true for void methods.
+     */
+    boolean isVoid();
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java?rev=1150144&r1=1150143&r2=1150144&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderPhaseMethodWorker.java Sat Jul 23 16:57:06 2011
@@ -138,7 +138,7 @@ public class RenderPhaseMethodWorker imp
 
                 // Non-void methods will pass a value to the event.
 
-                if (!method.getDescription().returnType.equals("void"))
+                if (!method.isVoid())
                 {
                     builder.boxPrimitive(method.getDescription().returnType);
                     builder.loadArgument(1).swap();