tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkuhn...@apache.org
Subject svn commit: r592156 - in /tapestry/tapestry4/trunk: tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/ tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/ tapestry-framework/src/java/org/apache/tapestry...
Date Mon, 05 Nov 2007 21:18:37 GMT
Author: jkuhnert
Date: Mon Nov  5 13:18:35 2007
New Revision: 592156

URL: http://svn.apache.org/viewvc?rev=592156&view=rev
Log:
Fixes TAPESTRY-1884.   Replace old green arrows with black arrows.

Modified:
    tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc
    tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/arrow-down.gif
    tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/arrow-up.gif
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java

Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc?rev=592156&r1=592155&r2=592156&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc
(original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc
Mon Nov  5 13:18:35 2007
@@ -16,8 +16,8 @@
 -->
 
 <!DOCTYPE component-specification PUBLIC
-        "-//Apache Software Foundation//Tapestry Specification 3.0//EN"
-        "http://tapestry.apache.org/dtd/Tapestry_3_0.dtd">
+        "-//Apache Software Foundation//Tapestry Specification 4.0//EN"
+        "http://tapestry.apache.org/dtd/Tapestry_4_0.dtd">
 
 <component-specification class="org.apache.tapestry.contrib.table.components.TablePages"
                          allow-body="no" allow-informal-parameters="yes">
@@ -28,9 +28,7 @@
     </description>
 
     <parameter name="pagesDisplayed"
-               type="int"
                required="no"
-               direction="auto"
                default-value="7">
         <description>
             Determines the maximum number of pages to be displayed in the page list
@@ -41,55 +39,55 @@
     <component id="informal" type="Any" inherit-informal-parameters="yes"/>
 
     <component id="condCurrent" type="If">
-        <binding name="condition" expression="condCurrent"/>
-        <binding name="renderTag" expression="false" />
+        <binding name="condition" value="condCurrent"/>
+        <binding name="renderTag" value="false" />
     </component>
 
     <component id="condOther" type="Else">
-        <binding name="renderTag" expression="false" />
+        <binding name="renderTag" value="false" />
     </component>
 
     <component id="iterPage" type="For">
-        <binding name="source" expression="pageList"/>
-        <binding name="value" expression="displayPage"/>
-        <binding name="renderTag" expression="false" />
+        <binding name="source" value="pageList"/>
+        <binding name="value" value="displayPage"/>
+        <binding name="renderTag" value="false" />
     </component>
 
     <component id="insertCurrentPage" type="Insert">
-        <binding name="value" expression="displayPage"/>
+        <binding name="value" value="displayPage"/>
     </component>
 
     <component id="insertOtherPage" type="Insert">
-        <binding name="value" expression="displayPage"/>
+        <binding name="value" value="displayPage"/>
     </component>
 
     <component id="linkPage" type="DirectLink">
-        <binding name="listener" expression="listeners.changePage"/>
-        <binding name="parameters" expression="displayPageContext"/>
+        <binding name="listener" value="listeners.changePage"/>
+        <binding name="parameters" value="displayPageContext"/>
     </component>
 
     <component id="linkFirst" type="DirectLink">
-        <binding name="listener" expression="listeners.changePage"/>
-        <binding name="parameters" expression="firstPageContext"/>
-        <binding name="disabled" expression="!condBack"/>
+        <binding name="listener" value="listeners.changePage"/>
+        <binding name="parameters" value="firstPageContext"/>
+        <binding name="disabled" value="!condBack"/>
     </component>
 
     <component id="linkBack" type="DirectLink">
-        <binding name="listener" expression="listeners.changePage"/>
-        <binding name="parameters" expression="backPageContext"/>
-        <binding name="disabled" expression="!condBack"/>
+        <binding name="listener" value="listeners.changePage"/>
+        <binding name="parameters" value="backPageContext"/>
+        <binding name="disabled" value="!condBack"/>
     </component>
 
     <component id="linkFwd" type="DirectLink">
-        <binding name="listener" expression="listeners.changePage"/>
-        <binding name="parameters" expression="fwdPageContext"/>
-        <binding name="disabled" expression="!condFwd"/>
+        <binding name="listener" value="listeners.changePage"/>
+        <binding name="parameters" value="fwdPageContext"/>
+        <binding name="disabled" value="!condFwd"/>
     </component>
 
     <component id="linkLast" type="DirectLink">
-        <binding name="listener" expression="listeners.changePage"/>
-        <binding name="parameters" expression="lastPageContext"/>
-        <binding name="disabled" expression="!condFwd"/>
+        <binding name="listener" value="listeners.changePage"/>
+        <binding name="parameters" value="lastPageContext"/>
+        <binding name="disabled" value="!condFwd"/>
     </component>
 
 </component-specification>

Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/arrow-down.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/arrow-down.gif?rev=592156&r1=592155&r2=592156&view=diff
==============================================================================
Binary files - no diff available.

Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/arrow-up.gif
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/inserted/arrow-up.gif?rev=592156&r1=592155&r2=592156&view=diff
==============================================================================
Binary files - no diff available.

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java?rev=592156&r1=592155&r2=592156&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/binding/ExpressionBinding.java
Mon Nov  5 13:18:35 2007
@@ -220,7 +220,9 @@
                     }
                 }
             } else
+            {
                 _evaluator.write(_root, _accessor, value);
+            }
         }
         catch (Throwable ex)
         {

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java?rev=592156&r1=592155&r2=592156&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ExpressionEvaluatorImpl.java
Mon Nov  5 13:18:35 2007
@@ -171,7 +171,12 @@
         try
         {
             context = (OgnlContext)_contextPool.borrowObject();
+
+            // setup context
             
+            context.setRoot(target);
+            context.setCurrentObject(target);
+
             expression.set(context, target, value);
         }
         catch (Exception ex)



Mime
View raw message