svn commit: r632192 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry/services/ main/resources/org/apache/tapestry/corelib/pages/ site/apt/ test/java/org/apache/tapestry/integration/ test/java/org/apache/tapestry/integrati...

[hl...@apache.org]

Author: hlship
Date: Thu Feb 28 17:12:04 2008
New Revision: 632192

URL: http://svn.apache.org/viewvc?rev=632192&view=rev
Log:
TAPESTRY-2208: The data type "checkbox" should be renamed to "boolean" to reflect what it is, rather than how it is rendered

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml
    tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/services/AppModule.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=632192&r1=632191&r2=632192&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java Thu Feb 28 17:12:04 2008
@@ -319,7 +319,7 @@
 
     /**
      * Maps property types to data type names: <ul> <li>String --&gt; text <li>Number --&gt; text <li>Enum --&gt; enum
-     * <li>Boolean --&gt; checkbox <li>Date --&gt; date </ul>
+     * <li>Boolean --&gt; boolean <li>Date --&gt; date </ul>
      */
     public static void contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class, String> configuration)
     {
@@ -335,7 +335,7 @@
 
         configuration.add(Number.class, "text");
         configuration.add(Enum.class, "enum");
-        configuration.add(Boolean.class, "checkbox");
+        configuration.add(Boolean.class, "boolean");
         configuration.add(Date.class, "date");
     }
 
@@ -343,7 +343,7 @@
     {
         addEditBlock(configuration, "text");
         addEditBlock(configuration, "enum");
-        addEditBlock(configuration, "checkbox");
+        addEditBlock(configuration, "boolean");
         addEditBlock(configuration, "date");
         addEditBlock(configuration, "password");
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml?rev=632192&r1=632191&r2=632192&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml Thu Feb 28 17:12:04 2008
@@ -10,7 +10,7 @@
         <input t:id="select"/>
     </t:block>
 
-    <t:block id="checkbox">
+    <t:block id="boolean">
         <t:label for="checkboxField"/>
         <input t:id="checkboxField"/>
     </t:block>

Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt?rev=632192&r1=632191&r2=632192&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt Thu Feb 28 17:12:04 2008
@@ -52,4 +52,10 @@
 
   The <<<getWidth()>>> method was removed from the
   {{{../apidocs/org/apache/tapestry/beaneditor/PropertyModel.java}PropertyModel}} interface; the logic
-  for deducing the desired field size from the @Width annotation has been moved into AbstractTextField.
\ No newline at end of file
+  for deducing the desired field size from the @Width annotation has been moved into AbstractTextField.
+
+* Grid, BeanEditForm, BeanEditor, BeanDisplay
+
+  The data type for boolean values has changed from "checkbox" (reflecting how it is rendered in an edit form) to "boolean"
+  (reflecting what it is). This will only affect your application if you provided an overriding contribution
+  to the {{{../apidocs/org/apache/tapestry/services/BeanBlockSource.html}BeanBlockSource}} service.
\ No newline at end of file

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?rev=632192&r1=632191&r2=632192&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java Thu Feb 28 17:12:04 2008
@@ -1785,7 +1785,7 @@
 
         clickAndWait(SUBMIT);
 
-        assertSourcePresent("<div class=\"t-beandisplay-value\">237</div>");
+        assertText("//div[@class['t-beandisplay-value value']", "237");
     }
 
     /**

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/services/AppModule.java?rev=632192&r1=632191&r2=632192&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/services/AppModule.java Thu Feb 28 17:12:04 2008
@@ -21,6 +21,6 @@
 {
     public void contributeBeanBlockOverrideSource(Configuration<BeanBlockContribution> configuration)
     {
-        configuration.add(new BeanBlockContribution("checkbox", "PropertyDisplayBlockOverrides", "boolean", false));
+        configuration.add(new BeanBlockContribution("boolean", "PropertyDisplayBlockOverrides", "boolean", false));
     }
 }