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:40:44 UTC
svn commit: r729707 - in /ofbiz/trunk/framework:
entity/src/org/ofbiz/entity/finder/ minilang/dtd/
minilang/src/org/ofbiz/minilang/method/entityops/
Author: jonesde
Date: Sun Dec 28 00:40:44 2008
New Revision: 729707
URL: http://svn.apache.org/viewvc?rev=729707&view=rev
Log:
Fixed issue where the attribute value was used for two things, so where it means an entity generic value it is now value-field and an actual String or other type of value is just plain value
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java
ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
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/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/RefreshValue.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/StoreValue.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java?rev=729707&r1=729706&r2=729707&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java Sun Dec 28 00:40:44 2008
@@ -51,7 +51,11 @@
public PrimaryKeyFinder(Element entityOneElement) {
super(entityOneElement);
- this.valueNameAcsr = FlexibleMapAccessor.getInstance(entityOneElement.getAttribute("value-name"));
+ if (UtilValidate.isNotEmpty(entityOneElement.getAttribute("value-field"))) {
+ this.valueNameAcsr = FlexibleMapAccessor.getInstance(entityOneElement.getAttribute("value-field"));
+ } else {
+ this.valueNameAcsr = FlexibleMapAccessor.getInstance(entityOneElement.getAttribute("value-name"));
+ }
this.autoFieldMapExdr = FlexibleStringExpander.getInstance(entityOneElement.getAttribute("auto-field-map"));
// process field-map
Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd?rev=729707&r1=729706&r2=729707&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd Sun Dec 28 00:40:44 2008
@@ -1756,7 +1756,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.make-next-seq-id">
- <xs:attribute type="xs:string" name="value" use="required">
+ <xs:attribute type="xs:string" name="value-field" use="required">
<xs:annotation>
<xs:documentation>
Specify the name of the entity for a sequenced-id-to-env preparing the primarySequencedId.
@@ -1902,10 +1902,10 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="value" use="required">
+ <xs:attribute type="xs:string" name="value-field" use="required">
<xs:annotation>
<xs:documentation>
- The name of the method environment field that contains the GenericValue object.
+ The name of the method environment field that will contain the GenericValue object.
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -2046,7 +2046,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="value-name" type="xs:string" use="required">
+ <xs:attribute name="value-field" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
Name of the variable to put result record in.
@@ -2112,7 +2112,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="use-cache" default="false">
+ <xs:attribute name="use-cache" type="xs:string" default="false">
<xs:annotation>
<xs:documentation>
Specifies whether or not the delegator's cache should be searched before going to the database.
@@ -2634,7 +2634,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.get-related-one">
- <xs:attribute name="value" type="xs:string" use="required">
+ <xs:attribute name="value-field" 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.
@@ -2648,7 +2648,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="use-cache" default="false">
+ <xs:attribute name="use-cache" type="xs:string" default="false">
<xs:annotation>
<xs:documentation>
Specifies whether or not the delegator's cache should be searched before going to the database.
@@ -2657,7 +2657,7 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:string" name="to-value" use="required">
+ <xs:attribute name="to-value-field" type="xs:string" 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" use="required">
+ <xs:attribute type="xs:string" name="value-field" 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.
@@ -2886,7 +2886,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.make-value">
- <xs:attribute type="xs:string" name="value" use="required">
+ <xs:attribute type="xs:string" name="value-field" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
@@ -2920,14 +2920,14 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.clone-value">
- <xs:attribute type="xs:string" name="value" use="required">
+ <xs:attribute type="xs:string" name="value-field" 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" use="required">
+ <xs:attribute type="xs:string" name="new-value-field" 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" use="required">
+ <xs:attribute type="xs:string" name="value-field" 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" use="required">
+ <xs:attribute type="xs:string" name="value-field" 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" use="required">
+ <xs:attribute type="xs:string" name="value-field" 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" use="required">
+ <xs:attribute type="xs:string" name="value-field" 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" use="required">
+ <xs:attribute type="xs:string" name="value-field" use="required">
<xs:annotation>
<xs:documentation>
Name of a generic value to remove all related records.
@@ -3234,7 +3234,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.set-pk-fields">
- <xs:attribute type="xs:string" name="value" use="required">
+ <xs:attribute type="xs:string" name="value-field" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
@@ -3274,7 +3274,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.set-nonpk-fields">
- <xs:attribute type="xs:string" name="value" use="required">
+ <xs:attribute type="xs:string" name="value-field" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the GenericValue object.
@@ -4483,7 +4483,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.set-current-user-login">
- <xs:attribute type="xs:string" name="value" use="required">
+ <xs:attribute type="xs:string" name="value-field" use="required">
<xs:annotation>
<xs:documentation>
The name of the method environment field that contains the UserLogin GenericValue object.
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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -47,8 +47,8 @@
public CloneValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
- newValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("new-value"), element.getAttribute("new-value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), element.getAttribute("value-name"));
+ newValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("new-value-field"), 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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -50,7 +50,7 @@
public CreateValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), 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/FindByPrimaryKey.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java?rev=729707&r1=729706&r2=729707&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:40:44 2008
@@ -60,7 +60,7 @@
public FindByPrimaryKey(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), element.getAttribute("value-name"));
entityName = element.getAttribute("entity-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"));
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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -55,7 +55,7 @@
public GetRelated(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), element.getAttribute("value-name"));
relationName = element.getAttribute("relation-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"));
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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -50,8 +50,8 @@
public GetRelatedOne(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<Object>(element.getAttribute("value"), element.getAttribute("value-name"));
- toValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("to-value"), element.getAttribute("to-value-name"));
+ valueAcsr = new ContextAccessor<Object>(element.getAttribute("value-field"), element.getAttribute("value-name"));
+ toValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("to-value-field"), 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=729707&r1=729706&r2=729707&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:40:44 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"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), 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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -45,7 +45,7 @@
public MakeValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), element.getAttribute("value-name"));
entityName = element.getAttribute("entity-name");
mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -48,7 +48,7 @@
public RefreshValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), element.getAttribute("value-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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -49,7 +49,7 @@
public RemoveRelated(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), 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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -48,7 +48,7 @@
public RemoveValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), 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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -46,7 +46,7 @@
public SetCurrentUserLogin(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), 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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -50,7 +50,7 @@
public SetNonpkFields(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), 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=729707&r1=729706&r2=729707&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:40:44 2008
@@ -50,7 +50,7 @@
public SetPkFields(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), 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/StoreValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java?rev=729707&r1=729706&r2=729707&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:40:44 2008
@@ -48,7 +48,7 @@
public StoreValue(Element element, SimpleMethod simpleMethod) {
super(element, simpleMethod);
- valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value"), element.getAttribute("value-name"));
+ valueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("value-field"), element.getAttribute("value-name"));
doCacheClearStr = element.getAttribute("do-cache-clear");
}