svn commit: r772722 - in /ofbiz/trunk/framework/example/widget/example: ExampleFeatureForms.xml ExampleForms.xml FormWidgetExampleForms.xml

[adrianc]

Author: adrianc
Date: Thu May  7 17:38:06 2009
New Revision: 772722

URL: http://svn.apache.org/viewvc?rev=772722&view=rev
Log:
Example component updated to use operator substitution.

Modified:
    ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml
    ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
    ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml

Modified: ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml?rev=772722&r1=772721&r2=772722&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleFeatureForms.xml Thu May  7 17:38:06 2009
@@ -54,8 +54,8 @@
         <alt-target use-when="exampleFeature==null" target="createExampleFeature"/>
         <auto-fields-service service-name="updateExampleFeature"/>
         <field use-when="exampleFeature!=null" name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="exampleFeature==null&amp;&amp;exampleFeatureId==null" name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}"><ignored/></field>
-        <field use-when="exampleFeature==null&amp;&amp;exampleFeatureId!=null" name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}"><display description="${uiLabelMap.CommonCannotBeFound}: [${exampleFeatureId}]" also-hidden="false"/></field>
+        <field use-when="exampleFeature==null @and exampleFeatureId==null" name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}"><ignored/></field>
+        <field use-when="exampleFeature==null @and exampleFeatureId!=null" name="exampleFeatureId" title="${uiLabelMap.ExampleExampleFeatureId}"><display description="${uiLabelMap.CommonCannotBeFound}: [${exampleFeatureId}]" also-hidden="false"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"/>
         <field name="featureSourceEnumId" title="${uiLabelMap.ExampleFeatureSource}">
             <drop-down allow-empty="false">

Modified: ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleForms.xml?rev=772722&r1=772721&r2=772722&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleForms.xml Thu May  7 17:38:06 2009
@@ -52,8 +52,8 @@
                 <field-map field-name="orderBy" from-field="parameters.sortField"/>
             </service>
         </actions>
-        <alt-row-style use-when="&quot;EXST_APPROVED&quot;.equals(statusId)" style="Validate"/>
-        <alt-row-style use-when="&quot;EXST_CANCELLED&quot;.equals(statusId)" style="Warn"/>
+        <alt-row-style use-when="'EXST_APPROVED'.equals(statusId)" style="Validate"/>
+        <alt-row-style use-when="'EXST_CANCELLED'.equals(statusId)" style="Warn"/>
         <field name="exampleId" title="${uiLabelMap.ExampleExampleId}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${exampleId}" target="EditExample">
                 <parameter param-name="exampleId"/>
@@ -103,8 +103,8 @@
         <alt-target use-when="example==null" target="createExample"/>
         <auto-fields-service service-name="updateExample"/>
         <field use-when="example!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="example==null&amp;&amp;exampleId==null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><ignored/></field>
-        <field use-when="example==null&amp;&amp;exampleId!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><display description="${uiLabelMap.CommonCannotBeFound}: [${exampleId}]" also-hidden="false"/></field>
+        <field use-when="example==null @and exampleId==null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><ignored/></field>
+        <field use-when="example==null @and exampleId!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><display description="${uiLabelMap.CommonCannotBeFound}: [${exampleId}]" also-hidden="false"/></field>
         <field name="exampleTypeId" title="${uiLabelMap.CommonType}" id-name="exampleTypeId">
             <drop-down allow-empty="false">
                 <!-- this is a neat feature, but not good for the type because the user would have to know the possible types in order to enter at least the first letter, so leaving it out by default; just uncomment to enable: <auto-complete/> -->
@@ -139,7 +139,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="displayAnotherText" use-when="example!=null&amp;&amp;example.get(&quot;anotherText&quot;)!=null">
+        <field name="displayAnotherText" use-when="example!=null @and example.get('anotherText')!=null">
             <display description="${example.anotherText}"/>
         </field>
         <field name="submitButton" use-when="example==null" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>

Modified: ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml?rev=772722&r1=772721&r2=772722&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml Thu May  7 17:38:06 2009
@@ -105,7 +105,7 @@
                entry-name="exampleDateField"
                title="${uiLabelMap.ExampleDateField7Title}"
                tooltip="${uiLabelMap.ExampleDateField7Tooltip}">
-            <display description="${groovy:org.ofbiz.base.util.UtilDateTime.toDateString(exampleDateField, &quot;MM/dd/yyyy&quot;);}"/>
+            <display description="${groovy:org.ofbiz.base.util.UtilDateTime.toDateString(exampleDateField, 'MM/dd/yyyy');}"/>
         </field>
         <!-- ***************** -->
         <!-- ***   field8  *** -->
@@ -114,7 +114,7 @@
                entry-name="exampleDateField"
                title="${uiLabelMap.ExampleDateField8Title}"
                tooltip="${uiLabelMap.ExampleDateField8Tooltip}">
-            <display description="${groovy:org.ofbiz.base.util.UtilDateTime.toDateString(exampleDateField, &quot;MMMM,dd,yyyy&quot;);}"/>
+            <display description="${groovy:org.ofbiz.base.util.UtilDateTime.toDateString(exampleDateField, 'MMMM,dd,yyyy');}"/>
         </field>
     </form>