[OFBiz] SVN: r7775 - in trunk/framework: entity/dtd minilang/dtd service/dtd widget/dtd widget/src/org/ofbiz/widget/form
jonesde@svn.ofbiz.org
jonesde at svn.ofbiz.org
Mon Jun 12 16:17:59 CDT 2006
Author: jonesde
Date: 2006-06-12 16:17:47 -0500 (Mon, 12 Jun 2006)
New Revision: 7775
Modified:
trunk/framework/entity/dtd/entity-eca.xsd
trunk/framework/minilang/dtd/simple-methods.xsd
trunk/framework/service/dtd/service-eca.xsd
trunk/framework/widget/dtd/widget-form.xsd
trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Log:
A few cleanups in the various XSD files, also added BigDecimal in some places where it was missing
Modified: trunk/framework/entity/dtd/entity-eca.xsd
===================================================================
--- trunk/framework/entity/dtd/entity-eca.xsd 2006-06-12 13:42:28 UTC (rev 7774)
+++ trunk/framework/entity/dtd/entity-eca.xsd 2006-06-12 21:17:47 UTC (rev 7775)
@@ -109,6 +109,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="PlainString"/>
<xs:enumeration value="String"/>
+ <xs:enumeration value="BigDecimal"/>
<xs:enumeration value="Double"/>
<xs:enumeration value="Float"/>
<xs:enumeration value="Long"/>
@@ -149,6 +150,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="PlainString"/>
<xs:enumeration value="String"/>
+ <xs:enumeration value="BigDecimal"/>
<xs:enumeration value="Double"/>
<xs:enumeration value="Float"/>
<xs:enumeration value="Long"/>
Modified: trunk/framework/minilang/dtd/simple-methods.xsd
===================================================================
--- trunk/framework/minilang/dtd/simple-methods.xsd 2006-06-12 13:42:28 UTC (rev 7774)
+++ trunk/framework/minilang/dtd/simple-methods.xsd 2006-06-12 21:17:47 UTC (rev 7775)
@@ -72,6 +72,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="PlainString"/>
<xs:enumeration value="String"/>
+ <xs:enumeration value="BigDecimal"/>
<xs:enumeration value="Double"/>
<xs:enumeration value="Float"/>
<xs:enumeration value="Long"/>
@@ -599,6 +600,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="PlainString"/>
<xs:enumeration value="String"/>
+ <xs:enumeration value="BigDecimal"/>
<xs:enumeration value="Double"/>
<xs:enumeration value="Float"/>
<xs:enumeration value="Long"/>
@@ -1990,6 +1992,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="PlainString"/>
<xs:enumeration value="String"/>
+ <xs:enumeration value="BigDecimal"/>
<xs:enumeration value="Double"/>
<xs:enumeration value="Float"/>
<xs:enumeration value="Long"/>
Modified: trunk/framework/service/dtd/service-eca.xsd
===================================================================
--- trunk/framework/service/dtd/service-eca.xsd 2006-06-12 13:42:28 UTC (rev 7774)
+++ trunk/framework/service/dtd/service-eca.xsd 2006-06-12 21:17:47 UTC (rev 7775)
@@ -106,6 +106,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="PlainString"/>
<xs:enumeration value="String"/>
+ <xs:enumeration value="BigDecimal"/>
<xs:enumeration value="Double"/>
<xs:enumeration value="Float"/>
<xs:enumeration value="Long"/>
@@ -148,6 +149,7 @@
<xs:restriction base="xs:token">
<xs:enumeration value="PlainString"/>
<xs:enumeration value="String"/>
+ <xs:enumeration value="BigDecimal"/>
<xs:enumeration value="Double"/>
<xs:enumeration value="Float"/>
<xs:enumeration value="Long"/>
Modified: trunk/framework/widget/dtd/widget-form.xsd
===================================================================
--- trunk/framework/widget/dtd/widget-form.xsd 2006-06-12 13:42:28 UTC (rev 7774)
+++ trunk/framework/widget/dtd/widget-form.xsd 2006-06-12 21:17:47 UTC (rev 7775)
@@ -61,6 +61,16 @@
</xs:attribute>
<xs:attribute type="xs:string" name="target"/>
<xs:attribute type="xs:string" name="target-window"/>
+ <xs:attribute name="target-type" default="intra-app">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="intra-app"/>
+ <xs:enumeration value="inter-app"/>
+ <xs:enumeration value="content"/>
+ <xs:enumeration value="plain"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
<xs:attribute type="xs:string" name="title"/>
<xs:attribute type="xs:string" name="tooltip"/>
<xs:attribute type="xs:string" name="list-name">
@@ -85,6 +95,14 @@
<xs:attribute type="xs:string" name="default-widget-style"/>
<xs:attribute type="xs:string" name="default-tooltip-style"/>
<xs:attribute type="xs:string" name="default-required-field-style"/>
+ <xs:attribute name="paginate" default="true">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
<xs:attribute type="xs:string" name="paginate-target">
<xs:annotation><xs:documentation>Target location for the [Previous] and [Next] buttons in a form with pagination. Accepts ${} notation.</xs:documentation></xs:annotation>
</xs:attribute>
@@ -121,14 +139,6 @@
</xs:simpleType>
</xs:attribute>
<xs:attribute type="xs:string" name="view-size"/>
- <xs:attribute name="paginate" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
<xs:attribute type="xs:string" name="row-count"/>
<xs:attribute name="use-row-submit" default="false">
<xs:simpleType>
@@ -138,24 +148,6 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="target-type" default="intra-app">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="intra-app"/>
- <xs:enumeration value="inter-app"/>
- <xs:enumeration value="content"/>
- <xs:enumeration value="plain"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="css-styling" default="false">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
<xs:attribute name="skip-start" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -186,12 +178,12 @@
<xs:attribute type="xs:string" name="even-row-style">
<xs:annotation><xs:documentation>The even-row-style specifies the style to use in the table content even rows.</xs:documentation></xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="default-table-style">
- <xs:annotation><xs:documentation>The default-table-style specifies the style to use in the table.</xs:documentation></xs:annotation>
- </xs:attribute>
<xs:attribute type="xs:string" name="header-row-style">
<xs:annotation><xs:documentation>The header-row-style specifies the style to use in the header of table.</xs:documentation></xs:annotation>
</xs:attribute>
+ <xs:attribute type="xs:string" name="default-table-style">
+ <xs:annotation><xs:documentation>The default-table-style specifies the style to use in the table.</xs:documentation></xs:annotation>
+ </xs:attribute>
<!-- not sure this is such a good idea
<xs:attribute type="xs:string" name="hidden-values-map-name">
<xs:annotation><xs:documentation>A map that contains hidden field name/value pairs.
@@ -396,9 +388,6 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute type="xs:string" name="required-field-style">
- <xs:annotation><xs:documentation>The name of a style (like a CSS class) to apply to the title of this field if required. Will default to form's default-required-field-style. If field is required, but required-field-style is empty, an '*' will be placed to the right of text, textarea and password fields.</xs:documentation></xs:annotation>
- </xs:attribute>
<xs:attribute name="required-field" default="false">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -407,6 +396,9 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute type="xs:string" name="required-field-style">
+ <xs:annotation><xs:documentation>The name of a style (like a CSS class) to apply to the title of this field if required. Will default to form's default-required-field-style. If field is required, but required-field-style is empty, an '*' will be placed to the right of text, textarea and password fields.</xs:documentation></xs:annotation>
+ </xs:attribute>
</xs:attributeGroup>
<!-- ================== FIELD TYPES ==================== -->
<xs:element name="check" substitutionGroup="AllFields">
Modified: trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
===================================================================
--- trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java 2006-06-12 13:42:28 UTC (rev 7774)
+++ trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java 2006-06-12 21:17:47 UTC (rev 7775)
@@ -95,7 +95,6 @@
protected String paginateNextStyle;
protected boolean separateColumns = false;
protected boolean paginate = true;
- protected boolean cssStyling = false;
protected boolean useRowSubmit = false;
protected FlexibleStringExpander targetWindowExdr;
protected String defaultRequiredFieldStyle;
@@ -362,7 +361,6 @@
}
this.paginate = "true".equals(formElement.getAttribute("paginate"));
- this.cssStyling = "true".equals(formElement.getAttribute("css-styling"));
this.skipStart = "true".equals(formElement.getAttribute("skip-start"));
this.skipEnd = "true".equals(formElement.getAttribute("skip-end"));
this.hideHeader = "true".equals(formElement.getAttribute("hide-header"));
@@ -1808,10 +1806,6 @@
return this.paginate;
}
- public boolean getCssStyling() {
- return this.cssStyling;
- }
-
public boolean getSkipStart() {
return this.skipStart;
}
More information about the Svn
mailing list