You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2008/12/28 09:17:48 UTC
svn commit: r729704 - in /ofbiz/trunk/framework:
entity/src/org/ofbiz/entity/finder/ minilang/dtd/
minilang/src/org/ofbiz/minilang/method/entityops/
minilang/src/org/ofbiz/minilang/method/envops/
minilang/src/org/ofbiz/minilang/method/ifops/ minilang/s...
Author: jonesde
Date: Sun Dec 28 00:17:47 2008
New Revision: 729704
URL: http://svn.apache.org/viewvc?rev=729704&view=rev
Log:
The last batch of the major changes to make naming in simple-method attributes more consistent and simplify due to simpler tools; again see the Simple Method Cleanup Effort docs page for details on changes; some additional cleanups may be done based on feedback but this should be most of it
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Sun Dec 28 00:17:47 2008
@@ -70,7 +70,10 @@
for (Element fieldMapElement: fieldMapElementList) {
// set the env-name for each field-name, noting that if no field-name is specified it defaults to the env-name
String fieldName = fieldMapElement.getAttribute("field-name");
- String envName = fieldMapElement.getAttribute("env-name");
+ String envName = fieldMapElement.getAttribute("from-field");
+ if (UtilValidate.isEmpty(envName)) {
+ envName = fieldMapElement.getAttribute("env-name");
+ }
String value = fieldMapElement.getAttribute("value");
if (UtilValidate.isEmpty(fieldName)) {
// no fieldName, use envName for both
@@ -167,7 +170,11 @@
}
this.operatorExdr = FlexibleStringExpander.getInstance(UtilFormatOut.checkEmpty(conditionExprElement.getAttribute("operator"), "equals"));
- this.envNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("env-name"));
+ if (UtilValidate.isNotEmpty(conditionExprElement.getAttribute("from-field"))) {
+ this.envNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("from-field"));
+ } else {
+ this.envNameAcsr = FlexibleMapAccessor.getInstance(conditionExprElement.getAttribute("env-name"));
+ }
this.valueExdr = FlexibleStringExpander.getInstance(conditionExprElement.getAttribute("value"));
this.ignoreIfNull = "true".equals(conditionExprElement.getAttribute("ignore-if-null"));
this.ignoreIfEmpty = "true".equals(conditionExprElement.getAttribute("ignore-if-empty"));
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java Sun Dec 28 00:17:47 2008
@@ -27,6 +27,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
@@ -78,7 +79,11 @@
this.filterByDateStrExdr = FlexibleStringExpander.getInstance(element.getAttribute("filter-by-date"));
this.distinctStrExdr = FlexibleStringExpander.getInstance(element.getAttribute("distinct"));
this.delegatorNameExdr = FlexibleStringExpander.getInstance(element.getAttribute("delegator-name"));
- this.listAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("list-name"));
+ if (UtilValidate.isNotEmpty(element.getAttribute("list"))) {
+ this.listAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("list"));
+ } else {
+ this.listAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("list-name"));
+ }
this.resultSetTypeExdr = FlexibleStringExpander.getInstance(element.getAttribute("result-set-type"));
// process select-field
Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd Sun Dec 28 00:17:47 2008
@@ -1756,7 +1756,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.make-next-seq-id">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
Specify the name of the entity for a sequenced-id-to-env preparing the primarySequencedId.
@@ -1895,14 +1895,14 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name" use="required">
+ <xs:attribute type="xs:string" name="map" use="required">
<xs:annotation>
<xs:documentation>
The name of a map in the method environment that will be used for the entity fields.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
@@ -1953,14 +1953,14 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name" use="required">
+ <xs:attribute type="xs:string" name="map" use="required">
<xs:annotation>
<xs:documentation>
The name of a map in the method environment that will be used for the entity fields.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="order-by-list-name">
+ <xs:attribute type="xs:string" name="order-by-list">
<xs:annotation>
<xs:documentation>
This will be a list sitting in the context that has string entries in it for each field that you want it to order by/
@@ -2004,10 +2004,10 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute type="xs:string" name="list-name" use="required">
+ <xs:attribute type="xs:string" name="list" use="required">
<xs:annotation>
<xs:documentation>
- The name of the method environment field that contains the list of GenericValue objects.
+ The name of the method environment field that will contain the list of GenericValue objects.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -2042,14 +2042,14 @@
<xs:attribute name="entity-name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
- Name of the entity to look for.
+ Name of the entity to query on.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="value-name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
- Name of the variable to put entity in.
+ Name of the variable to put result record in.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -2137,7 +2137,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="list-name" type="xs:string" use="required">
+ <xs:attribute name="list" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
Name of the list where to put results.
@@ -2232,7 +2232,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="list-name" type="xs:string" use="required">
+ <xs:attribute name="list" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
Name of the list where to put results.
@@ -2351,10 +2351,10 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="env-name" type="xs:string">
+ <xs:attribute name="from-field" type="xs:string">
<xs:annotation>
<xs:documentation>
- Name of variable to apply operator on, combined with field-name.
+ Name of field (variable) to apply operator on, along with field-name.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -2554,7 +2554,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="env-name">
+ <xs:attribute type="xs:string" name="from-field">
<xs:annotation>
<xs:documentation>
Name of the variable in the context.
@@ -2612,10 +2612,10 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="count-name" type="xs:string" use="required">
+ <xs:attribute name="count-field" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
- Name of the variable to put result of the count in.
+ Name of the field (variable) to put result of the count in.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -2634,7 +2634,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.get-related-one">
- <xs:attribute name="value-name" type="xs:string" use="required">
+ <xs:attribute name="value" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
Name of a generic value sitting in the context from where you want to get a related-one generic value.
@@ -2657,7 +2657,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="to-value-name" use="required">
+ <xs:attribute type="xs:string" name="to-value" use="required">
<xs:annotation>
<xs:documentation>
Name of a generic value where to put the result.
@@ -2686,7 +2686,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.get-related">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
Name of a generic value sitting in the context from where you want to get a related generic value.
@@ -2700,7 +2700,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
+ <xs:attribute type="xs:string" name="map">
<xs:annotation>
<xs:documentation>
Name of a map that will restrain the query further,
@@ -2708,7 +2708,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="order-by-list-name">
+ <xs:attribute type="xs:string" name="order-by-list">
<xs:annotation>
<xs:documentation>
This will be a list sitting in the context that has string entries in it for each field that you want it to order by/
@@ -2727,7 +2727,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="list-name" use="required">
+ <xs:attribute type="xs:string" name="list" use="required">
<xs:annotation>
<xs:documentation>
Name of a list where to put the result in.
@@ -2747,14 +2747,14 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.order-value-list">
- <xs:attribute type="xs:string" name="list-name" use="required">
+ <xs:attribute type="xs:string" name="list" use="required">
<xs:annotation>
<xs:documentation>
Name of the list of generic value objects that we want to sort.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="to-list-name">
+ <xs:attribute type="xs:string" name="to-list">
<xs:annotation>
<xs:documentation>
Name of the output list. If it is empty, as it is optional, it will simply use the list-name.
@@ -2762,7 +2762,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="order-by-list-name" use="required">
+ <xs:attribute type="xs:string" name="order-by-list" use="required">
<xs:annotation>
<xs:documentation>
This will be a list sitting in the context that has string entries in it for each field that you want it to order by.
@@ -2784,14 +2784,14 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.filter-list-by-and">
- <xs:attribute type="xs:string" name="list-name" use="required">
+ <xs:attribute type="xs:string" name="list" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the list of GenericValue objects.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="to-list-name">
+ <xs:attribute type="xs:string" name="to-list">
<xs:annotation>
<xs:documentation>
The name of the method environment field the filtered list will be put into.
@@ -2799,7 +2799,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
+ <xs:attribute type="xs:string" name="map">
<xs:annotation>
<xs:documentation>
The name of a map in the method environment that will be used for the entity fields.
@@ -2819,14 +2819,14 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.filter-list-by-date">
- <xs:attribute type="xs:string" name="list-name" use="required">
+ <xs:attribute type="xs:string" name="list" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the list of GenericValue objects.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="to-list-name">
+ <xs:attribute type="xs:string" name="to-list">
<xs:annotation>
<xs:documentation>
The name of the method environment field the filtered list will be put into.
@@ -2834,7 +2834,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="valid-date-name">
+ <xs:attribute type="xs:string" name="valid-date">
<xs:annotation>
<xs:documentation>
The name of a field in the method environment date to filter by.
@@ -2886,7 +2886,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.make-value">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
@@ -2900,7 +2900,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
+ <xs:attribute type="xs:string" name="map">
<xs:annotation>
<xs:documentation>
The name of a map in the method environment that will be used for the entity fields.
@@ -2920,14 +2920,14 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.clone-value">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="new-value-name" use="required">
+ <xs:attribute type="xs:string" name="new-value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that will contain the new GenericValue object.
@@ -2947,7 +2947,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.create-value">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
@@ -2993,7 +2993,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.store-value">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
@@ -3025,7 +3025,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.refresh-value">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
Name of the value to refresh from database.
@@ -3058,7 +3058,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.remove-value">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
@@ -3115,7 +3115,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.remove-related">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
Name of a generic value to remove all related records.
@@ -3162,7 +3162,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name" use="required">
+ <xs:attribute type="xs:string" name="map" use="required">
<xs:annotation>
<xs:documentation>
The name of a map in the method environment that will be used for the entity fields.
@@ -3202,7 +3202,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
+ <xs:attribute type="xs:string" name="map">
<xs:annotation>
<xs:documentation>
The name of a map in the method environment that will be used for the entity fields.
@@ -3234,14 +3234,14 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.set-pk-fields">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
+ <xs:attribute type="xs:string" name="map">
<xs:annotation>
<xs:documentation>
The name of a map in the method environment that will be used for the entity fields.
@@ -3274,14 +3274,14 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.set-nonpk-fields">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
+ <xs:attribute type="xs:string" name="map">
<xs:annotation>
<xs:documentation>
The name of a map in the method environment that will be used for the entity fields.
@@ -3315,7 +3315,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.store-list">
- <xs:attribute type="xs:string" name="list-name" use="required">
+ <xs:attribute type="xs:string" name="list" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the list of GenericValue objects.
@@ -3348,7 +3348,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.remove-list">
- <xs:attribute type="xs:string" name="list-name" use="required">
+ <xs:attribute type="xs:string" name="list" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the list of GenericValue objects.
@@ -3387,14 +3387,14 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.iterate">
- <xs:attribute type="xs:string" name="entry-name" use="required">
+ <xs:attribute type="xs:string" name="entry" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that will contain each entry as we iterate through the list.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="list-name" use="required">
+ <xs:attribute type="xs:string" name="list" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the list to iterate over.
@@ -3420,21 +3420,21 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.iterate-map">
- <xs:attribute type="xs:string" name="key-name" use="required">
+ <xs:attribute type="xs:string" name="key" use="required">
<xs:annotation>
<xs:documentation>
Name of the variable to put the key.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
Name of the variable to put the value in.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name" use="required">
+ <xs:attribute type="xs:string" name="map" use="required">
<xs:annotation>
<xs:documentation>
Name of the map to use.
@@ -3827,18 +3827,10 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.if-validate-method">
- <xs:attribute type="xs:string" name="map-name">
- <xs:annotation>
- <xs:documentation>
- The name of the method environment field that contains the map that the field to be validated will come from.
- If not specified the field-name will be treated as a method environment field name (an env-name).
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute type="xs:string" name="field-name" use="required">
+ <xs:attribute type="xs:string" name="field" use="required">
<xs:annotation>
<xs:documentation>
- The name of the map field that will be validated.
+ The name of the field (variable) that will be validated.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -3889,15 +3881,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.if-instance-of">
- <xs:attribute type="xs:string" name="map-name">
- <xs:annotation>
- <xs:documentation>
- The name of the method environment field that contains the map that the field to be validated will come from.
- If not specified the field-name will be treated as a method environment field name (an env-name).
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute type="xs:string" name="field-name" use="required">
+ <xs:attribute type="xs:string" name="field" use="required">
<xs:annotation>
<xs:documentation>
The name of the map field that will be validated as being an instance of the named class.
@@ -4058,15 +4042,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.if-regexp">
- <xs:attribute type="xs:string" name="map-name">
- <xs:annotation>
- <xs:documentation>
- The name of the method environment field that contains the map that the field to be validated will come from.
- If not specified the field-name will be treated as a method environment field name (an env-name).
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute type="xs:string" name="field-name" use="required">
+ <xs:attribute type="xs:string" name="field" use="required">
<xs:annotation>
<xs:documentation>
The name of the map field that will be compared.
@@ -4328,21 +4304,13 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.check-id">
- <xs:attribute type="xs:string" name="field-name" use="required">
+ <xs:attribute type="xs:string" name="field" use="required">
<xs:annotation>
<xs:documentation>
The name of the field that contains the ID value to check.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
- <xs:annotation>
- <xs:documentation>
- The name of the Map that contains the field.
- If not specified the environment will be used to find the field.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute type="xs:string" name="error-list-name" default="error_list">
<xs:annotation>
<xs:documentation>
@@ -4411,7 +4379,7 @@
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
- <xs:element name="now-timestamp-to-env" substitutionGroup="OtherOperations">
+ <xs:element name="now-timestamp" substitutionGroup="OtherOperations">
<xs:annotation>
<xs:documentation>
The now-timestamp-to-env tag creates a java.sql.Timestamp object with the current date and time in it and puts it in a field in the method environment.
@@ -4422,7 +4390,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.now-timestamp-to-env">
- <xs:attribute type="xs:string" name="env-name" use="required">
+ <xs:attribute type="xs:string" name="field" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field the timestamp will be put in.
@@ -4440,7 +4408,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.now-date-to-env">
- <xs:attribute type="xs:string" name="env-name" use="required">
+ <xs:attribute type="xs:string" name="field" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field the date will be put in.
@@ -4473,15 +4441,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
- <xs:annotation>
- <xs:documentation>
- The name of the map in the method environment.
- If not specified the field-name will be used to get the field from the method environment.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute type="xs:string" name="field-name" use="required">
+ <xs:attribute type="xs:string" name="field" use="required">
<xs:annotation>
<xs:documentation>
The name (key) of the map field to use.
@@ -4523,7 +4483,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.set-current-user-login">
- <xs:attribute type="xs:string" name="value-name" use="required">
+ <xs:attribute type="xs:string" name="value" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the UserLogin GenericValue object.
@@ -4560,15 +4520,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.calculate">
- <xs:attribute type="xs:string" name="map-name">
- <xs:annotation>
- <xs:documentation>
- The name of the map in the method environment.
- If not specified the field-name will be used to get the field from the method environment.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute type="xs:string" name="field-name" use="required">
+ <xs:attribute type="xs:string" name="field" use="required">
<xs:annotation><xs:documentation>The name (key) of the map (or env if map-name is empty) field to use.</xs:documentation></xs:annotation>
</xs:attribute>
<xs:attribute name="type" default="Double">
@@ -4648,15 +4600,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute type="xs:string" name="map-name">
- <xs:annotation>
- <xs:documentation>
- The name of the map in the method environment.
- If not specified the field-name will be used to get the field from the method environment.
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute type="xs:string" name="field-name">
+ <xs:attribute type="xs:string" name="field">
<xs:annotation>
<xs:documentation>
The name (key) of the map field to use.
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java Sun Dec 28 00:17:47 2008
@@ -48,7 +48,7 @@
public ClearCacheLine(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
entityName = element.getAttribute("entity-name");
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
+ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
}
public boolean exec(MethodContext methodContext) {
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java Sun Dec 28 00:17:47 2008
@@ -47,8 +47,8 @@
public CloneValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
- newValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("new-value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ newValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("new-value"), element.getAttribute("new-value-name"));
}
public boolean exec(MethodContext methodContext) {
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java Sun Dec 28 00:17:47 2008
@@ -50,7 +50,7 @@
public CreateValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
doCacheClearStr = element.getAttribute("do-cache-clear");
createOrStore = "true".equals(element.getAttribute("or-store"));
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java Sun Dec 28 00:17:47 2008
@@ -22,6 +22,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.GeneralException;
+import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
import org.ofbiz.base.util.string.FlexibleStringExpander;
@@ -62,7 +63,11 @@
super(element, simpleMethod);
this.entityNameExdr = FlexibleStringExpander.getInstance(element.getAttribute("entity-name"));
this.delegatorNameExdr = FlexibleStringExpander.getInstance(element.getAttribute("delegator-name"));
- this.countAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("count-name"));
+ if (UtilValidate.isNotEmpty(element.getAttribute("count-field"))) {
+ this.countAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("count-field"));
+ } else {
+ this.countAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("count-name"));
+ }
// process condition-expr | condition-list
Element conditionExprElement = UtilXml.firstChildElement(element, "condition-expr");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java Sun Dec 28 00:17:47 2008
@@ -49,8 +49,11 @@
public FilterListByAnd(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- listAcsr = new ContextAccessor<List<GenericEntity>>(element.getAttribute("list-name"));
- toListAcsr = new ContextAccessor<List<GenericEntity>>(element.getAttribute("to-list-name"), element.getAttribute("list-name"));
+ listAcsr = new ContextAccessor<List<GenericEntity>>(element.getAttribute("list"), element.getAttribute("list-name"));
+ toListAcsr = new ContextAccessor<List<GenericEntity>>(element.getAttribute("to-list"), element.getAttribute("to-list-name"));
+ if (toListAcsr.isEmpty()) {
+ toListAcsr = listAcsr;
+ }
mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java Sun Dec 28 00:17:47 2008
@@ -54,9 +54,12 @@
public FilterListByDate(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- listAcsr = new ContextAccessor<List<GenericEntity>>(element.getAttribute("list-name"));
- toListAcsr = new ContextAccessor<List<GenericEntity>>(element.getAttribute("to-list-name"), element.getAttribute("list-name"));
- validDateAcsr = new ContextAccessor<Timestamp>(element.getAttribute("valid-date-name"));
+ listAcsr = new ContextAccessor<List<GenericEntity>>(element.getAttribute("list"), element.getAttribute("list-name"));
+ toListAcsr = new ContextAccessor<List<GenericEntity>>(element.getAttribute("to-list"), element.getAttribute("to-list-name"));
+ if (toListAcsr.isEmpty()) {
+ toListAcsr = listAcsr;
+ }
+ validDateAcsr = new ContextAccessor<Timestamp>(element.getAttribute("valid-date"), element.getAttribute("valid-date-name"));
fromFieldName = element.getAttribute("from-field-name");
if (UtilValidate.isEmpty(fromFieldName)) fromFieldName = "fromDate";
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java Sun Dec 28 00:17:47 2008
@@ -60,10 +60,10 @@
public FindByAnd(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- listAcsr = new ContextAccessor<Object>(element.getAttribute("list-name"));
+ listAcsr = new ContextAccessor<Object>(element.getAttribute("list"), element.getAttribute("list-name"));
entityName = element.getAttribute("entity-name");
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
- orderByListAcsr = new ContextAccessor<List<String>>(element.getAttribute("order-by-list-name"));
+ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
+ orderByListAcsr = new ContextAccessor<List<String>>(element.getAttribute("order-by-list"), element.getAttribute("order-by-list-name"));
delegatorName = element.getAttribute("delegator-name");
useCacheStr = element.getAttribute("use-cache");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java Sun Dec 28 00:17:47 2008
@@ -60,9 +60,9 @@
public FindByPrimaryKey(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
entityName = element.getAttribute("entity-name");
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
+ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
fieldsToSelectListAcsr = new ContextAccessor<Collection<String>>(element.getAttribute("fields-to-select-list"));
delegatorName = element.getAttribute("delegator-name");
useCacheStr = element.getAttribute("use-cache");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java Sun Dec 28 00:17:47 2008
@@ -55,11 +55,11 @@
public GetRelated(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
relationName = element.getAttribute("relation-name");
- listAcsr = new ContextAccessor<List<GenericValue>>(element.getAttribute("list-name"));
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
- orderByListAcsr = new ContextAccessor<List<String>>(element.getAttribute("order-by-list-name"));
+ listAcsr = new ContextAccessor<List<GenericValue>>(element.getAttribute("list"), element.getAttribute("list-name"));
+ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
+ orderByListAcsr = new ContextAccessor<List<String>>(element.getAttribute("order-by-list"), element.getAttribute("order-by-list-name"));
useCacheStr = element.getAttribute("use-cache");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java Sun Dec 28 00:17:47 2008
@@ -50,8 +50,8 @@
public GetRelatedOne(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<Object>(element.getAttribute("value-name"));
- toValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("to-value-name"));
+ valueAcsr = new ContextAccessor<Object>(element.getAttribute("value"), element.getAttribute("value-name"));
+ toValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("to-value"), element.getAttribute("to-value-name"));
relationName = element.getAttribute("relation-name");
useCacheStr = element.getAttribute("use-cache");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java Sun Dec 28 00:17:47 2008
@@ -51,7 +51,7 @@
public MakeNextSeqId(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
seqFieldName = element.getAttribute("seq-field-name");
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
numericPaddingStr = element.getAttribute("numeric-padding");
incrementByStr = element.getAttribute("increment-by");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java Sun Dec 28 00:17:47 2008
@@ -45,9 +45,9 @@
public MakeValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
entityName = element.getAttribute("entity-name");
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
+ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
}
public boolean exec(MethodContext methodContext) {
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java Sun Dec 28 00:17:47 2008
@@ -36,12 +36,21 @@
return "now-date-to-env";
}
}
+ public static final class NowDateFactory implements Factory<NowDateToEnv> {
+ public NowDateToEnv createMethodOperation(Element element, SimpleMethod simpleMethod) {
+ return new NowDateToEnv(element, simpleMethod);
+ }
+
+ public String getName() {
+ return "now-date";
+ }
+ }
ContextAccessor<java.sql.Date> envAcsr;
public NowDateToEnv(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- envAcsr = new ContextAccessor<java.sql.Date>(element.getAttribute("env-name"));
+ envAcsr = new ContextAccessor<java.sql.Date>(element.getAttribute("field"), element.getAttribute("env-name"));
}
public boolean exec(MethodContext methodContext) {
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java Sun Dec 28 00:17:47 2008
@@ -36,12 +36,21 @@
return "now-timestamp-to-env";
}
}
+ public static final class NowTimestampFactory implements Factory<NowTimestampToEnv> {
+ public NowTimestampToEnv createMethodOperation(Element element, SimpleMethod simpleMethod) {
+ return new NowTimestampToEnv(element, simpleMethod);
+ }
+
+ public String getName() {
+ return "now-timestamp";
+ }
+ }
ContextAccessor<java.sql.Timestamp> envAcsr;
public NowTimestampToEnv(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- envAcsr = new ContextAccessor<java.sql.Timestamp>(element.getAttribute("env-name"));
+ envAcsr = new ContextAccessor<java.sql.Timestamp>(element.getAttribute("field"), element.getAttribute("env-name"));
}
public boolean exec(MethodContext methodContext) {
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java Sun Dec 28 00:17:47 2008
@@ -48,8 +48,11 @@
public OrderValueList(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- listAcsr = new ContextAccessor<List<? extends GenericEntity>>(element.getAttribute("list-name"));
- toListAcsr = new ContextAccessor<List<? extends GenericEntity>>(element.getAttribute("to-list-name"), element.getAttribute("list-name"));
+ listAcsr = new ContextAccessor<List<? extends GenericEntity>>(element.getAttribute("list"), element.getAttribute("list-name"));
+ toListAcsr = new ContextAccessor<List<? extends GenericEntity>>(element.getAttribute("to-list"), element.getAttribute("to-list-name"));
+ if (toListAcsr.isEmpty()) {
+ toListAcsr = listAcsr;
+ }
orderByListAcsr = new ContextAccessor<List<String>>(element.getAttribute("order-by-list-name"));
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java Sun Dec 28 00:17:47 2008
@@ -48,7 +48,7 @@
public RefreshValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
doCacheClearStr = element.getAttribute("do-cache-clear");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java Sun Dec 28 00:17:47 2008
@@ -51,7 +51,7 @@
public RemoveByAnd(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
entityName = element.getAttribute("entity-name");
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
+ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
doCacheClearStr = element.getAttribute("do-cache-clear");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java Sun Dec 28 00:17:47 2008
@@ -50,7 +50,7 @@
public RemoveList(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- listAcsr = new ContextAccessor<List<GenericValue>>(element.getAttribute("list-name"));
+ listAcsr = new ContextAccessor<List<GenericValue>>(element.getAttribute("list"), element.getAttribute("list-name"));
doCacheClearStr = element.getAttribute("do-cache-clear");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java Sun Dec 28 00:17:47 2008
@@ -49,7 +49,7 @@
public RemoveRelated(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
relationName = element.getAttribute("relation-name");
doCacheClearStr = element.getAttribute("do-cache-clear");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java Sun Dec 28 00:17:47 2008
@@ -48,7 +48,7 @@
public RemoveValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
doCacheClearStr = element.getAttribute("do-cache-clear");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java Sun Dec 28 00:17:47 2008
@@ -46,7 +46,7 @@
public SetCurrentUserLogin(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
}
public boolean exec(MethodContext methodContext) {
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java Sun Dec 28 00:17:47 2008
@@ -50,8 +50,8 @@
public SetNonpkFields(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
setIfNullStr = element.getAttribute("set-if-null");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java Sun Dec 28 00:17:47 2008
@@ -50,8 +50,8 @@
public SetPkFields(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
setIfNullStr = element.getAttribute("set-if-null");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java Sun Dec 28 00:17:47 2008
@@ -50,7 +50,7 @@
public StoreList(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- listAcsr = new ContextAccessor<List<GenericValue>>(element.getAttribute("list-name"));
+ listAcsr = new ContextAccessor<List<GenericValue>>(element.getAttribute("list"), element.getAttribute("list-name"));
doCacheClearStr = element.getAttribute("do-cache-clear");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java Sun Dec 28 00:17:47 2008
@@ -48,7 +48,7 @@
public StoreValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
doCacheClearStr = element.getAttribute("do-cache-clear");
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java Sun Dec 28 00:17:47 2008
@@ -58,8 +58,8 @@
public Iterate(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- this.entryAcsr = new ContextAccessor<Object>(element.getAttribute("entry-name"));
- this.listAcsr = new ContextAccessor<Object>(element.getAttribute("list-name"));
+ this.entryAcsr = new ContextAccessor<Object>(element.getAttribute("entry"), element.getAttribute("entry-name"));
+ this.listAcsr = new ContextAccessor<Object>(element.getAttribute("list"), element.getAttribute("list-name"));
SimpleMethod.readOperations(element, subOps, simpleMethod);
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java Sun Dec 28 00:17:47 2008
@@ -55,9 +55,9 @@
public IterateMap(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- this.keyAcsr = new ContextAccessor<Object>(element.getAttribute("key-name"));
- this.valueAcsr = new ContextAccessor<Object>(element.getAttribute("value-name"));
- this.mapAcsr = new ContextAccessor<Map<? extends Object, ? extends Object>>(element.getAttribute("map-name"));
+ this.keyAcsr = new ContextAccessor<Object>(element.getAttribute("key"), element.getAttribute("key-name"));
+ this.valueAcsr = new ContextAccessor<Object>(element.getAttribute("value"), element.getAttribute("value-name"));
+ this.mapAcsr = new ContextAccessor<Map<? extends Object, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
SimpleMethod.readOperations(element, subOps, simpleMethod);
}
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java Sun Dec 28 00:17:47 2008
@@ -53,7 +53,8 @@
public CheckId(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
+ // the schema for this element now just has the "field" attribute, though the old "field-name" and "map-name" pair is still supported
+ this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name"));
this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
this.errorListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("error-list-name"), "error_list");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java Sun Dec 28 00:17:47 2008
@@ -55,8 +55,9 @@
public IfInstanceOf(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
+ // the schema for this element now just has the "field" attribute, though the old "field-name" and "map-name" pair is still supported
+ this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name"));
this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
- this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
this.className = element.getAttribute("class");
SimpleMethod.readOperations(element, subOps, simpleMethod);
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java Sun Dec 28 00:17:47 2008
@@ -59,8 +59,9 @@
public IfRegexp(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
+ // the schema for this element now just has the "field" attribute, though the old "field-name" and "map-name" pair is still supported
+ this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name"));
this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
- this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
this.exprExdr = FlexibleStringExpander.getInstance(element.getAttribute("expr"));
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java Sun Dec 28 00:17:47 2008
@@ -55,8 +55,9 @@
public IfValidateMethod(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
+ // the schema for this element now just has the "field" attribute, though the old "field-name" and "map-name" pair is still supported
+ this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name"));
this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
- this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
this.methodName = element.getAttribute("method");
this.className = element.getAttribute("class");
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java Sun Dec 28 00:17:47 2008
@@ -70,8 +70,9 @@
public Calculate(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name"));
- fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
+ // the schema for this element now just has the "field" attribute, though the old "field-name" and "map-name" pair is still supported
+ this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name"));
+ this.mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name"));
decimalScaleString = element.getAttribute("decimal-scale");
decimalFormatString = element.getAttribute("decimal-format");
@@ -269,8 +270,9 @@
Calculate.SubCalc calcops[];
public CalcOp(Element element) {
- mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
- fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
+ // the schema for this element now just has the "field" attribute, though the old "field-name" and "map-name" pair is still supported
+ this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name"));
+ this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
operatorStr = element.getAttribute("operator");
List<? extends Element> calcopElements = UtilXml.childElementList(element);
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java?rev=729704&r1=729703&r2=729704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java Sun Dec 28 00:17:47 2008
@@ -55,8 +55,9 @@
super(element, simpleMethod);
resource = element.getAttribute("resource");
property = element.getAttribute("property");
- mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name"));
- fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name"));
+ // the schema for this element now just has the "field" attribute, though the old "field-name" and "map-name" pair is still supported
+ this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name"));
+ this.mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name"));
defaultVal = element.getAttribute("default");
// defaults to false, ie anything but true is false
noLocale = "true".equals(element.getAttribute("no-locale"));