svn commit: r728520 - in /ofbiz/trunk/framework/minilan
Locked
svn commit: r728520 - in /ofbiz/trunk/framework/minilan
 
|
Author: jonesde
Date: Sun Dec 21 13:51:23 2008 New Revision: 728520 URL: http://svn.apache.org/viewvc?rev=728520&view=rev Log: More cleanup of simple method attributes to make them more consistent, still quite a bit left to go, working through the file and down to order-map-list, more to come soon to get this finished up so we can move on, note that these changes are and will be documented in the Simple Method Cleanup Effort page in the OFBTECH space on docs.ofbiz.org Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd (original) +++ ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd Sun Dec 21 13:51:23 2008 @@ -114,19 +114,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field"> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the field to put value in. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - Name of the related map. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>Name of the field to put value in.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="type"> <xs:annotation> @@ -453,25 +442,13 @@ </xs:element> <xs:attributeGroup name="attlist.set-service-fields"> <xs:attribute type="xs:string" name="service-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the service from which take all the incoming files, or all incoming attributes. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>Name of the service to get all the incoming attributes (parameters) from.</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name" use="required"> - <xs:annotation> - <xs:documentation> - Incoming map to copy fields from. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="map" use="required"> + <xs:annotation><xs:documentation>Incoming map to copy fields from.</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-map-name" use="required"> - <xs:annotation> - <xs:documentation> - Map to copy to fields to. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="to-map" use="required"> + <xs:annotation><xs:documentation>Map to copy to fields to.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="error-list-name" default="error_list"> <xs:annotation> @@ -717,23 +694,12 @@ <xs:annotation> <xs:documentation> Name of the result. May be used for the field-name. If you don't specify a field-name, - that's the name of the variable that will be created in the current context for the value of that result. + this will be name of the variable that will be created in the current context for the value of that result. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - Optionnal map name. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name"> - <xs:annotation> - <xs:documentation> - Optionnal field name. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field"> + <xs:annotation><xs:documentation>Optional name of target field. If empty will default to result-name.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="result-to-request"> @@ -962,21 +928,13 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.call-object-method"> - <xs:attribute type="xs:string" name="obj-field-name" use="required"> + <xs:attribute type="xs:string" name="obj-field" use="required"> <xs:annotation> <xs:documentation> The name of the field the object is in that has the method to be called. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="obj-map-name"> - <xs:annotation> - <xs:documentation> - The name of the map the field of the object is in that has the method to be called. - If this is not specified the environment will be used to find the field in. - </xs:documentation> - </xs:annotation> - </xs:attribute> <xs:attribute type="xs:string" name="method-name" use="required"> <xs:annotation> <xs:documentation> @@ -984,7 +942,7 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="ret-field-name"> + <xs:attribute type="xs:string" name="ret-field"> <xs:annotation> <xs:documentation> The name of the field to put the result in. @@ -992,14 +950,6 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="ret-map-name"> - <xs:annotation> - <xs:documentation> - The name of the map the field of the return value is in. - If not specified but the field name is then the environment will be used to find the field in. - </xs:documentation> - </xs:annotation> - </xs:attribute> </xs:attributeGroup> <xs:element name="call-class-method" substitutionGroup="CallOperations"> <xs:annotation> @@ -1050,27 +1000,18 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="ret-field-name"> + <xs:attribute type="xs:string" name="ret-field"> <xs:annotation> <xs:documentation> The name of the field to put the result in. If not specified any return value will be ignored. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="ret-map-name"> - <xs:annotation> - <xs:documentation> - The name of the map the field of the return value is in. - If not specified but the field name is then the environment will be used to find the field in. - </xs:documentation> - </xs:annotation> - </xs:attribute> </xs:attributeGroup> <xs:element name="create-object" substitutionGroup="CallOperations"> <xs:annotation> <xs:documentation> - Creates an object of the given class and if the field-name is specified saves it in that field. - + Creates an object of the given class and if the field attribute is specified saves it in that field. The string and field sub-elements are passed to the constructor method as arguments in the order they are specified. If the sub-elements do not match the constructor method arguments an error will be returned. </xs:documentation> @@ -1105,7 +1046,7 @@ </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 of a field to put the new object in. @@ -1113,14 +1054,6 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="map-name"> - <xs:annotation> - <xs:documentation> - The name of the map the field will go in. - If not specified the field will be put in the environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> </xs:attributeGroup> <!-- Operations to copy map fields in the current env to context specific containers --> <!-- Event specific operations --> @@ -1130,33 +1063,17 @@ The field-to-request tag copies a field from a map to the specified servlet request attribute. The tag is only used when the simple-method is called as an event, it is ignored otherwise. </xs:documentation> - </xs:annotation> + </xs:annotation> <xs:complexType> <xs:attributeGroup ref="attlist.field-to-request"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field-to-request"> - <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:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The context name of the field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="request-name"> - <xs:annotation> - <xs:documentation> - The name of the request attribute to use. Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the request attribute to use. Defaults to the value of field attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="field-to-session" substitutionGroup="EventOperations"> @@ -1165,33 +1082,17 @@ The field-to-session tag copies a field from a map to the specified servlet session attribute. The tag is only used when the simple-method is called as an event, it is ignored otherwise. </xs:documentation> - </xs:annotation> + </xs:annotation> <xs:complexType> <xs:attributeGroup ref="attlist.field-to-session"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field-to-session"> - <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:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The context name of the field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="session-name"> - <xs:annotation> - <xs:documentation> - The name of the session attribute to use. Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the session attribute to use. Defaults to the value of field attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="request-to-field" substitutionGroup="EventOperations"> @@ -1206,20 +1107,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.request-to-field"> - <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 set the field in the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The context name of the field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="default"> <xs:annotation> @@ -1230,12 +1119,7 @@ </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="request-name"> - <xs:annotation> - <xs:documentation> - The name of the request attribute to use. - Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the request attribute to use. Defaults to the value of the field attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="request-parameters-to-list" substitutionGroup="EventOperations"> @@ -1278,20 +1162,8 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.session-to-field"> - <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 set the field in the method environment. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The name (key) of the map field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="default"> <xs:annotation> @@ -1304,7 +1176,7 @@ <xs:attribute type="xs:string" name="session-name"> <xs:annotation> <xs:documentation> - The name of the session attribute to use. Defaults to the field-name. + The name of the session attribute to use. Defaults to the value of field attribute. </xs:documentation> </xs:annotation> </xs:attribute> @@ -1331,11 +1203,7 @@ </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="property" use="required"> - <xs:annotation> - <xs:documentation> - The property whose value will be put in the field. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The property whose value will be put in the field.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="default"> <xs:annotation> @@ -1345,19 +1213,11 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="field-name" use="required"> - <xs:annotation> - <xs:documentation> - The name (key) of the field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The name (key) of the field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="session-name"> - <xs:annotation> - <xs:documentation> - The name of the session attribute to use. Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the session attribute to use. Defaults to the value of field attribute</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <!-- Service specific operations --> @@ -1373,27 +1233,11 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field-to-result"> - <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:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The name (key) of the map field to use.</xs:documentation></xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="result-name"> - <xs:annotation> - <xs:documentation> - The name of the request attribute to use. Defaults to the field-name. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>The name of the result Map name/key to use. Defaults to the value of field attribute.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <!-- Environment specific operations --> @@ -1408,14 +1252,10 @@ </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.map-to-map"> - <xs:attribute type="xs:string" name="map-name" use="required"> - <xs:annotation> - <xs:documentation> - The name of the map in the method environment the fields will come from. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="map" use="required"> + <xs:annotation><xs:documentation>The name of the map in the method environment the fields will come from.</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-map-name"> + <xs:attribute type="xs:string" name="to-map"> <xs:annotation> <xs:documentation> The name of the map in the method environment the fields will go to. @@ -1425,85 +1265,40 @@ </xs:attribute> </xs:attributeGroup> <xs:element name="field-to-list" substitutionGroup="EnvOperations"> - <xs:annotation> - <xs:documentation> - The field-to-list tag appends a field to the specified list. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="attlist.field-to-list"/> - </xs:complexType> + <xs:annotation><xs:documentation>The field-to-list tag appends a field to the specified list.</xs:documentation></xs:annotation> + <xs:complexType><xs:attributeGroup ref="attlist.field-to-list"/></xs:complexType> </xs:element> <xs:attributeGroup name="attlist.field-to-list"> - <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:annotation> - <xs:documentation> - The name (key) of the map field to use. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="field" use="required"> + <xs:annotation><xs:documentation>The name (key) of the map field to use.</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="list-name" use="required"> - <xs:annotation> - <xs:documentation> - The name of the list in the method environment that the object will be appended to. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="list" use="required"> + <xs:annotation><xs:documentation>The name of the list in the method environment that the object will be appended to.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="list-to-list" substitutionGroup="EnvOperations"> - <xs:annotation> - <xs:documentation> - Copy a list to another list. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="attlist.list-to-list"/> - </xs:complexType> + <xs:annotation><xs:documentation>Copy a list to another list.</xs:documentation></xs:annotation> + <xs:complexType><xs:attributeGroup ref="attlist.list-to-list"/></xs:complexType> </xs:element> <xs:attributeGroup name="attlist.list-to-list"> - <xs:attribute type="xs:string" name="list-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the list to copy from - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="list" use="required"> + <xs:annotation><xs:documentation>Name of the list to copy from</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="to-list-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the list to copy to. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="to-list" use="required"> + <xs:annotation><xs:documentation>Name of the list to copy to.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="order-map-list" substitutionGroup="EnvOperations"> - <xs:annotation> - <xs:documentation> - Sort a list : ordered by fields names given in order-by attribute. - </xs:documentation> + <xs:annotation><xs:documentation>Sort a List containing Maps: order by fields names given in order-by sub-element.</xs:documentation> </xs:annotation> <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="order-by"/> - </xs:sequence> + <xs:sequence><xs:element maxOccurs="unbounded" ref="order-by"/></xs:sequence> <xs:attributeGroup ref="attlist.order-map-list"/> </xs:complexType> </xs:element> <xs:attributeGroup name="attlist.order-map-list"> - <xs:attribute type="xs:string" name="list-name" use="required"> - <xs:annotation> - <xs:documentation> - Name of the list ordered by fields names given in order-by attribute. - </xs:documentation> - </xs:annotation> + <xs:attribute type="xs:string" name="list" use="required"> + <xs:annotation><xs:documentation>Name of the list to be sorted.</xs:documentation></xs:annotation> </xs:attribute> </xs:attributeGroup> <xs:element name="set" substitutionGroup="EnvOperations"> @@ -2318,18 +2113,10 @@ <xs:sequence> <xs:element maxOccurs="unbounded" ref="field-map"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field"> - <xs:annotation> - <xs:documentation> - Specify fields to select, otherwise all fields will be selected. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>Specify fields to select, otherwise all fields will be selected.</xs:documentation></xs:annotation> </xs:element> <xs:element minOccurs="0" maxOccurs="unbounded" ref="order-by"> - <xs:annotation> - <xs:documentation> - Defines fields to order list by. - </xs:documentation> - </xs:annotation> + <xs:annotation><xs:documentation>Defines fields to order list by.</xs:documentation></xs:annotation> </xs:element> <xs:choice minOccurs="0"> <xs:element ref="limit-range"/> Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java Sun Dec 21 13:51:23 2008 @@ -37,8 +37,10 @@ public FieldObject(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); - fieldAcsr = new ContextAccessor<T>(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 + fieldAcsr = new ContextAccessor<T>(element.getAttribute("field"), element.getAttribute("field-name")); mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); + type = element.getAttribute("type"); if (UtilValidate.isEmpty(type)) { type = "String"; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java Sun Dec 21 13:51:23 2008 @@ -57,7 +57,8 @@ super(element, simpleMethod); className = element.getAttribute("class-name"); methodName = element.getAttribute("method-name"); - retFieldAcsr = new ContextAccessor<Object>(element.getAttribute("ret-field-name")); + // the schema for this element now just has the "ret-field" attribute, though the old "ret-field-name" and "ret-map-name" pair is still supported + retFieldAcsr = new ContextAccessor<Object>(element.getAttribute("ret-field"), element.getAttribute("ret-field-name")); retMapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("ret-map-name")); List<? extends Element> parameterElements = UtilXml.childElementList(element); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java Sun Dec 21 13:51:23 2008 @@ -57,10 +57,14 @@ public CallObjectMethod(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); - objFieldAcsr = new ContextAccessor<Object>(element.getAttribute("obj-field-name")); + // the schema for this element now just has the "obj-field" attribute, though the old "obj-field-name" and "obj-map-name" pair is still supported + objFieldAcsr = new ContextAccessor<Object>(element.getAttribute("obj-field"), element.getAttribute("obj-field-name")); objMapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("obj-map-name")); + methodName = element.getAttribute("method-name"); - retFieldAcsr = new ContextAccessor<Object>(element.getAttribute("ret-field-name")); + + // the schema for this element now just has the "ret-field" attribute, though the old "ret-field-name" and "ret-map-name" pair is still supported + retFieldAcsr = new ContextAccessor<Object>(element.getAttribute("ret-field"), element.getAttribute("ret-field-name")); retMapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("ret-map-name")); List<? extends Element> parameterElements = UtilXml.childElementList(element); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java Sun Dec 21 13:51:23 2008 @@ -18,9 +18,6 @@ *******************************************************************************/ package org.ofbiz.minilang.method.callops; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -141,7 +138,9 @@ rtfDef.resultName = resultToFieldElement.getAttribute("result-name"); rtfDef.mapAcsr = new ContextAccessor<Map<String, Object>>(resultToFieldElement.getAttribute("map-name")); - rtfDef.fieldAcsr = new ContextAccessor<Object>(resultToFieldElement.getAttribute("field-name"), rtfDef.resultName); + String field = resultToFieldElement.getAttribute("field"); + if (UtilValidate.isEmpty(field)) field = resultToFieldElement.getAttribute("field-name"); + rtfDef.fieldAcsr = new ContextAccessor<Object>(field, rtfDef.resultName); resultToField.add(rtfDef); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java Sun Dec 21 13:51:23 2008 @@ -56,7 +56,9 @@ public CreateObject(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); className = element.getAttribute("class-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 + fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name")); mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name")); List<? extends Element> parameterElements = UtilXml.childElementList(element); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java Sun Dec 21 13:51:23 2008 @@ -64,8 +64,8 @@ public SetServiceFields(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); serviceName = element.getAttribute("service-name"); - mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); - toMapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("to-map-name")); + mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name")); + toMapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("to-map"), element.getAttribute("to-map-name")); errorListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("error-list-name"), "error_list"); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java Sun Dec 21 13:51:23 2008 @@ -49,9 +49,10 @@ public FieldToList(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 mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); - fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); - listAcsr = new ContextAccessor<List<Object>>(element.getAttribute("list-name")); + fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name")); + listAcsr = new ContextAccessor<List<Object>>(element.getAttribute("list"), element.getAttribute("list-name")); } public boolean exec(MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java Sun Dec 21 13:51:23 2008 @@ -48,12 +48,11 @@ public ListToList(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); - listAcsr = new ContextAccessor<List<Object>>(element.getAttribute("list-name")); - toListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("to-list-name")); + listAcsr = new ContextAccessor<List<Object>>(element.getAttribute("list"), element.getAttribute("list-name")); + toListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("to-list"), element.getAttribute("to-list-name")); } public boolean exec(MethodContext methodContext) { - List<Object> fromList = listAcsr.get(methodContext); List<Object> toList = toListAcsr.get(methodContext); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java Sun Dec 21 13:51:23 2008 @@ -48,8 +48,8 @@ public MapToMap(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); - mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name")); - toMapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("to-map-name")); + mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map"), element.getAttribute("map-name")); + toMapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("to-map"), element.getAttribute("to-map-name")); } public boolean exec(MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java Sun Dec 21 13:51:23 2008 @@ -51,10 +51,11 @@ public OrderMapList(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); - listAcsr = new ContextAccessor<List<Map<Object, Object>>>(element.getAttribute("list-name")); + listAcsr = new ContextAccessor<List<Map<Object, Object>>>(element.getAttribute("list"), element.getAttribute("list-name")); for (Element orderByElement: UtilXml.childElementList(element, "order-by")) { - FlexibleMapAccessor<String> fma = FlexibleMapAccessor.getInstance(orderByElement.getAttribute("field-name")); + FlexibleMapAccessor<String> fma = FlexibleMapAccessor.getInstance(UtilValidate.isNotEmpty(orderByElement.getAttribute("field")) ? + orderByElement.getAttribute("field") : orderByElement.getAttribute("field-name")); this.orderByAcsrList.add(fma); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java Sun Dec 21 13:51:23 2008 @@ -50,9 +50,10 @@ public FieldToRequest(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 mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); - fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); - requestAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("request-name"), element.getAttribute("field-name")); + fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name")); + requestAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("request-name"), fieldAcsr.toString()); } public boolean exec(MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java Sun Dec 21 13:51:23 2008 @@ -50,9 +50,10 @@ public FieldToSession(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 mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); - fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); - sessionAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("session-name"), element.getAttribute("field-name")); + fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name")); + sessionAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("session-name"), fieldAcsr.toString()); } public boolean exec(MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java Sun Dec 21 13:51:23 2008 @@ -52,9 +52,11 @@ public RequestToField(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 mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name")); - fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); - requestAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("request-name"), element.getAttribute("field-name")); + fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name")); + requestAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("request-name"), fieldAcsr.toString()); + defaultVal = element.getAttribute("default"); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java Sun Dec 21 13:51:23 2008 @@ -53,9 +53,11 @@ public SessionToField(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 mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name")); - fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); - sessionAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("session-name"), element.getAttribute("field-name")); + fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name")); + sessionAcsr = new FlexibleServletAccessor<Object>(element.getAttribute("session-name"), fieldAcsr.toString()); + defaultVal = element.getAttribute("default"); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java Sun Dec 21 13:51:23 2008 @@ -55,8 +55,10 @@ resource = element.getAttribute("resource"); property = element.getAttribute("property"); defaultVal = element.getAttribute("default"); + + // the schema for this element now just has the "field" attribute, though the old "field-name" and "map-name" pair is still supported + fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name")); mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name")); - fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); } public boolean exec(MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java?rev=728520&r1=728519&r2=728520&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java Sun Dec 21 13:51:23 2008 @@ -47,9 +47,10 @@ public FieldToResult(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 mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); - fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); - resultAcsr = new ContextAccessor<Object>(element.getAttribute("result-name"), element.getAttribute("field-name")); + fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field"), element.getAttribute("field-name")); + resultAcsr = new ContextAccessor<Object>(element.getAttribute("result-name"), fieldAcsr.toString()); } public boolean exec(MethodContext methodContext) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |