Author: hlship
Date: Thu Feb 28 18:53:16 2008
New Revision: 632213
URL: http://svn.apache.org/viewvc?rev=632213&view=rev
Log:
TAPESTRY-2206: Tapestry should have a different data type for numbers than for
strings
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java
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/main/resources/org/apache/tapestry/default.css
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java?rev=632213&r1=632212&r2=632213&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java
Thu Feb 28 18:53:16 2008
@@ -40,7 +40,7 @@
@Component(
parameters = { "value=context.propertyValue",
"label=prop:context.label", "translate=prop:context.translator",
"validate=prop:textFieldValidator", "clientId=prop:context.propertyId",
"annotationProvider=context" })
- private TextField _textField;
+ private TextField _textField, _numberField;
@Component(
parameters = { "value=context.propertyValue",
"label=prop:context.label", "encoder=valueEncoderForProperty",
"model=selectModelForProperty", "validate=prop:selectValidator",
"clientId=prop:context.propertyId" })
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=632213&r1=632212&r2=632213&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 18:53:16 2008
@@ -318,7 +318,7 @@
}
/**
- * Maps property types to data type names: <ul> <li>String --> text
<li>Number --> text <li>Enum --> enum
+ * Maps property types to data type names: <ul> <li>String --> text
<li>Number --> number <li>Enum --> enum
* <li>Boolean --> boolean <li>Date --> date </ul>
*/
public static void
contributeDefaultDataTypeAnalyzer(MappedConfiguration<Class, String>
configuration)
@@ -329,11 +329,7 @@
configuration.add(Object.class, "");
configuration.add(String.class, "text");
-
- // This may change; as currently implemented, "text" refers more to
the edit component
- // (TextField) than to the "flavor" of data.
-
- configuration.add(Number.class, "text");
+ configuration.add(Number.class, "number");
configuration.add(Enum.class, "enum");
configuration.add(Boolean.class, "boolean");
configuration.add(Date.class, "date");
@@ -342,6 +338,7 @@
public static void
contributeBeanBlockSource(Configuration<BeanBlockContribution> configuration)
{
addEditBlock(configuration, "text");
+ addEditBlock(configuration, "number");
addEditBlock(configuration, "enum");
addEditBlock(configuration, "boolean");
addEditBlock(configuration, "date");
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=632213&r1=632212&r2=632213&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 18:53:16 2008
@@ -5,6 +5,12 @@
<input t:id="textField"/>
</t:block>
+ <t:block id="number">
+ <t:label for="numberField"/>
+ <input t:id="numberField" class="t-number"/>
+ </t:block>
+
+
<t:block id="enum">
<t:label for="select"/>
<input t:id="select"/>
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/default.css
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/default.css?rev=632213&r1=632212&r2=632213&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/default.css
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/default.css
Thu Feb 28 18:53:16 2008
@@ -154,6 +154,10 @@
vertical-align: middle;
}
+INPUT.t-number {
+ text-align: right;
+}
+
DIV.t-beandisplay DIV.t-beandisplay-label {
padding-right: 5px;
}
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=632213&r1=632212&r2=632213&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
18:53:16 2008
@@ -57,5 +57,6 @@
* 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
+ (reflecting what it is). In addition, all numeric types are given the data
type "number".
+ This will only affect your application if you provided an overriding
contribution
to the
{{{../apidocs/org/apache/tapestry/services/BeanBlockSource.html}BeanBlockSource}}
service.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java?rev=632213&r1=632212&r2=632213&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java
Thu Feb 28 18:53:16 2008
@@ -79,7 +79,7 @@
assertEquals(age.getLabel(), "Age");
assertSame(age.getPropertyType(), int.class);
- assertEquals(age.getDataType(), "text");
+ assertEquals(age.getDataType(), "number");
PropertyModel firstName = model.get("firstName");
