Re: svn commit: r737194 - in /ofbiz/trunk/framework: minilang/dtd/simple-methods.xsd widget/dtd/widget-screen.xsd widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java

[Jacques Le Roux]

Site updated in revision: 737204

Jacques

From: <jone...@apache.org>

Author: jonesde
Date: Fri Jan 23 13:30:17 2009
New Revision: 737194

URL: http://svn.apache.org/viewvc?rev=737194&view=rev
Log:
Chanded a few more attribute names for consistency, based on feedback from Marco

Modified:
   ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
   ofbiz/trunk/framework/widget/dtd/widget-screen.xsd
   
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java

Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd?rev=737194&r1=737193&r2=737194&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd Fri Jan 23 13:30:17 
2009
@@ -2427,7 +2427,7 @@
        </xs:complexType>
    </xs:element>
    <xs:attributeGroup name="attlist.condition-object">
-        <xs:attribute name="field-name" type="xs:string" use="required">
+        <xs:attribute name="field" type="xs:string" use="required">
            <xs:annotation>
                <xs:documentation>
                    Field in the current context where that condition object is 
that implements the entity condition interface.

Modified: ofbiz/trunk/framework/widget/dtd/widget-screen.xsd
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-screen.xsd?rev=737194&r1=737193&r2=737194&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-screen.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-screen.xsd Fri Jan 23 13:30:17 2009
@@ -684,7 +684,7 @@
        </xs:complexType>
    </xs:element>
    <xs:attributeGroup name="attlist.condition-object">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="field" use="required"/>
    </xs:attributeGroup>
    <xs:element name="select-field">
        <xs:complexType>
@@ -1080,11 +1080,11 @@
        </xs:complexType>
    </xs:element>
    <xs:attributeGroup name="attlist.iterate-section">
-        <xs:attribute type="xs:string" name="entry-name" use="required"/>
-        <xs:attribute type="xs:string" name="list-name" use="required"/>
-        <xs:attribute type="xs:string" name="key-name" />
-        <xs:attribute type="xs:string" name="view-size" />
-        <xs:attribute type="xs:string" name="paginate-target" />
+        <xs:attribute type="xs:string" name="entry" use="required"/>
+        <xs:attribute type="xs:string" name="list" use="required"/>
+        <xs:attribute type="xs:string" name="key"/>
+        <xs:attribute type="xs:string" name="view-size"/>
+        <xs:attribute type="xs:string" name="paginate-target"/>
        <xs:attribute name="paginate" default="false">
            <xs:simpleType>
                <xs:restriction base="xs:token">

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java

URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?rev=737194&r1=737193&r2=737194&view=diff

==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
 (original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
 Fri Jan 23 13:30:17 2009
@@ -73,9 +73,13 @@

    public IterateSectionWidget(ModelScreen modelScreen, Element 
iterateSectionElement) {
        super(modelScreen, iterateSectionElement);
-        listNameExdr = 
FlexibleMapAccessor.getInstance(iterateSectionElement.getAttribute("list-name"));
-        entryNameExdr = 
FlexibleStringExpander.getInstance(iterateSectionElement.getAttribute("entry-name"));
-        keyNameExdr = 
FlexibleStringExpander.getInstance(iterateSectionElement.getAttribute("key-name"));
+        listNameExdr = 
FlexibleMapAccessor.getInstance(iterateSectionElement.getAttribute("list"));

+ if (listNameExdr.isEmpty()) listNameExdr = FlexibleMapAccessor.getInstance(iterateSectionElement.getAttribute("list-name"));

+        entryNameExdr = 
FlexibleStringExpander.getInstance(iterateSectionElement.getAttribute("entry"));

+ if (entryNameExdr.isEmpty()) entryNameExdr = FlexibleStringExpander.getInstance(iterateSectionElement.getAttribute("entry-name"));

+        keyNameExdr = 
FlexibleStringExpander.getInstance(iterateSectionElement.getAttribute("key"));

+ if (keyNameExdr.isEmpty()) keyNameExdr = FlexibleStringExpander.getInstance(iterateSectionElement.getAttribute("key-name"));

+
        if (this.paginateTarget == null || 
iterateSectionElement.hasAttribute("paginate-target")) {
            this.paginateTarget = 
FlexibleStringExpander.getInstance(iterateSectionElement.getAttribute("paginate-target"));
        }