svn commit: r757074 [3/3] - in /ofbiz/trunk/framework/minilan
Locked
svn commit: r757074 [3/3] - in /ofbiz/trunk/framework/minilan
 
|
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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -40,9 +40,9 @@ return "field-to-list"; } } - + public static final String module = FieldToList.class.getName(); - + ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; ContextAccessor<List<Object>> listAcsr; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -38,7 +38,7 @@ return "first-from-list"; } } - + public static final String module = FirstFromList.class.getName(); ContextAccessor<Object> entryAcsr; 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -48,7 +48,7 @@ return "iterate"; } } - + public static final String module = Iterate.class.getName(); protected List<MethodOperation> subOps = FastList.newInstance(); @@ -125,7 +125,7 @@ entryAcsr.put(methodContext, oldEntryValue); return true; } - + public List<MethodOperation> getSubOps() { return this.subOps; } 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -44,7 +44,7 @@ return "iterate-map"; } } - + public static final String module = IterateMap.class.getName(); List<MethodOperation> subOps = FastList.newInstance(); @@ -78,7 +78,7 @@ if (oldValue != null) { Debug.logWarning("In iterate-map the value had a non-null value before entering the loop for the operation: " + this.rawString(), module); } - + Map<? extends Object, ? extends Object> theMap = mapAcsr.get(methodContext); if (theMap == null) { if (Debug.infoOn()) Debug.logInfo("Map not found with name " + mapAcsr + ", doing nothing: " + rawString(), module); 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -40,9 +40,9 @@ return "list-to-list"; } } - + public static final String module = ListToList.class.getName(); - + ContextAccessor<List<Object>> listAcsr; ContextAccessor<List<Object>> toListAcsr; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -64,7 +64,7 @@ try { Double ctDbl = Double.valueOf(countStrExp); if (ctDbl != null) { - count = ctDbl.intValue(); + count = ctDbl.intValue(); } } catch (NumberFormatException e) { Debug.logError(e, module); 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -40,9 +40,9 @@ return "map-to-map"; } } - + public static final String module = MapToMap.class.getName(); - + ContextAccessor<Map<String, Object>> mapAcsr; ContextAccessor<Map<String, Object>> toMapAcsr; 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,9 +42,9 @@ return "order-map-list"; } } - + public static final String module = FieldToList.class.getName(); - + protected ContextAccessor<List<Map<Object, Object>>> listAcsr; protected List<FlexibleMapAccessor<String>> orderByAcsrList = FastList.newInstance(); protected MapComparator mc; @@ -52,9 +52,9 @@ public OrderMapList(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); 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(UtilValidate.isNotEmpty(orderByElement.getAttribute("field")) ? + FlexibleMapAccessor<String> fma = FlexibleMapAccessor.getInstance(UtilValidate.isNotEmpty(orderByElement.getAttribute("field")) ? orderByElement.getAttribute("field") : orderByElement.getAttribute("field-name")); this.orderByAcsrList.add(fma); } @@ -70,7 +70,7 @@ if (Debug.infoOn()) Debug.logInfo("List not found with name " + listAcsr + ", not ordering/sorting list.", module); return true; } - + Collections.sort(orderList, mc); return true; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -47,7 +47,7 @@ } } public static final String module = SetCalendar.class.getName(); - + protected ContextAccessor<Timestamp> field; protected ContextAccessor<Object> fromField; protected FlexibleStringExpander valueExdr; @@ -145,7 +145,7 @@ if (Debug.verboseOn()) Debug.logVerbose("Error converting attributes to objects: " + e.getMessage(), module); return true; } - + // Convert Strings to ints int years = this.yearsExdr.isEmpty() ? 0 : Integer.parseInt(methodContext.expandString(this.yearsExdr)); int months = this.monthsExdr.isEmpty() ? 0 : Integer.parseInt(methodContext.expandString(this.monthsExdr)); @@ -164,7 +164,7 @@ cal.add(Calendar.DAY_OF_MONTH, days); cal.add(Calendar.MONTH, months); cal.add(Calendar.YEAR, years); - + Timestamp toStamp = new Timestamp(cal.getTimeInMillis()); // Align period start/end @@ -191,7 +191,7 @@ toStamp = UtilDateTime.getYearEnd(toStamp, timeZone, locale); } } - + if (Debug.verboseOn()) Debug.logVerbose("In screen setting calendar [" + this.field.toString(), module); this.field.put(methodContext, toStamp); @@ -199,10 +199,10 @@ } public String rawString() { - return "<set-calendar field=\"" + this.field - + (this.valueExdr.isEmpty() ? "" : "\" value=\"" + this.valueExdr.getOriginal()) - + (this.fromField.isEmpty() ? "" : "\" from-field=\"" + this.fromField) - + (this.defaultExdr.isEmpty() ? "" : "\" default-value=\"" + this.defaultExdr.getOriginal()) + return "<set-calendar field=\"" + this.field + + (this.valueExdr.isEmpty() ? "" : "\" value=\"" + this.valueExdr.getOriginal()) + + (this.fromField.isEmpty() ? "" : "\" from-field=\"" + this.fromField) + + (this.defaultExdr.isEmpty() ? "" : "\" default-value=\"" + this.defaultExdr.getOriginal()) + "\"/>"; } public String expandedString(MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -46,7 +46,7 @@ } } public static final String module = SetOperation.class.getName(); - + protected ContextAccessor<Object> field; protected ContextAccessor<Object> fromField; protected FlexibleStringExpander valueExdr; @@ -105,18 +105,18 @@ return false; } } - + if (Debug.verboseOn()) Debug.logVerbose("In screen setting field [" + this.field.toString() + "] to value: " + newValue, module); this.field.put(methodContext, newValue); return true; } public String rawString() { - return "<set field=\"" + this.field - + (this.valueExdr.isEmpty() ? "" : "\" value=\"" + this.valueExdr.getOriginal()) - + (this.fromField.isEmpty() ? "" : "\" from-field=\"" + this.fromField) - + (this.defaultExdr.isEmpty() ? "" : "\" default-value=\"" + this.defaultExdr.getOriginal()) - + (this.type == null || this.type.length() == 0 ? "" : "\" type=\"" + this.type) + return "<set field=\"" + this.field + + (this.valueExdr.isEmpty() ? "" : "\" value=\"" + this.valueExdr.getOriginal()) + + (this.fromField.isEmpty() ? "" : "\" from-field=\"" + this.fromField) + + (this.defaultExdr.isEmpty() ? "" : "\" default-value=\"" + this.defaultExdr.getOriginal()) + + (this.type == null || this.type.length() == 0 ? "" : "\" type=\"" + this.type) + "\"/>"; } public String expandedString(MethodContext methodContext) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,9 +42,9 @@ return "string-append"; } } - + public static final String module = StringAppend.class.getName(); - + String string; String prefix; String suffix; @@ -57,7 +57,7 @@ string = element.getAttribute("string"); prefix = element.getAttribute("prefix"); suffix = element.getAttribute("suffix"); - + // 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<String>(element.getAttribute("field"), element.getAttribute("field-name")); mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-name")); @@ -74,7 +74,7 @@ toMap = FastMap.newInstance(); mapAcsr.put(methodContext, toMap); } - + String oldValue = (String) fieldAcsr.get(toMap, methodContext); fieldAcsr.put(toMap, this.appendString(oldValue, methodContext), methodContext); } else { @@ -84,12 +84,12 @@ return true; } - + public String appendString(String oldValue, MethodContext methodContext) { String value = methodContext.expandString(string); String prefixValue = methodContext.expandString(prefix); String suffixValue = methodContext.expandString(suffix); - + if (!argListAcsr.isEmpty()) { List<? extends Object> argList = argListAcsr.get(methodContext); if (UtilValidate.isNotEmpty(argList)) { @@ -112,7 +112,7 @@ newValue.append(oldValue); } } - + return newValue.toString(); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -44,9 +44,9 @@ return "string-to-field"; } } - + public static final String module = StringToField.class.getName(); - + String string; ContextAccessor<Map<String, Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; @@ -64,7 +64,7 @@ public boolean exec(MethodContext methodContext) { String valueStr = methodContext.expandString(string); - + if (!argListAcsr.isEmpty()) { List<? extends Object> argList = argListAcsr.get(methodContext); if (UtilValidate.isNotEmpty(argList)) { @@ -78,7 +78,7 @@ } else { value = valueStr; } - + if (!mapAcsr.isEmpty()) { Map<String, Object> toMap = mapAcsr.get(methodContext); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,9 +42,9 @@ return "string-to-list"; } } - + public static final String module = StringToList.class.getName(); - + String string; ContextAccessor<List<Object>> listAcsr; ContextAccessor<List<? extends Object>> argListAcsr; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -41,9 +41,9 @@ return "to-string"; } } - + public static final String module = ToString.class.getName(); - + ContextAccessor<Map<String, Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; String format; @@ -55,9 +55,9 @@ // 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")); - + format = element.getAttribute("format"); - + String npStr = element.getAttribute("numeric-padding"); if (UtilValidate.isNotEmpty(npStr)) { try { @@ -93,7 +93,7 @@ return true; } - + public String doToString(Object obj, MethodContext methodContext) { String outStr = null; try { @@ -106,11 +106,11 @@ Debug.logError(e, "", module); outStr = obj.toString(); } - + if (this.numericPadding != null) { outStr = StringUtil.padNumberString(outStr, this.numericPadding.intValue()); } - + return outStr; } 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -41,9 +41,9 @@ return "field-to-request"; } } - + public static final String module = FieldToRequest.class.getName(); - + ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; FlexibleServletAccessor<Object> requestAcsr; 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -41,9 +41,9 @@ return "field-to-session"; } } - + public static final String module = FieldToSession.class.getName(); - + ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; FlexibleServletAccessor<Object> sessionAcsr; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,9 +42,9 @@ return "request-to-field"; } } - + public static final String module = RequestToField.class.getName(); - + ContextAccessor<Map<String, Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; FlexibleServletAccessor<Object> requestAcsr; @@ -56,7 +56,7 @@ mapAcsr = new ContextAccessor<Map<String, Object>>(element.getAttribute("map-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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -43,9 +43,9 @@ return "session-to-field"; } } - + public static final String module = SessionToField.class.getName(); - + ContextAccessor<Map<String, Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; FlexibleServletAccessor<Object> sessionAcsr; 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -41,9 +41,9 @@ return "webapp-property-to-field"; } } - + public static final String module = WebappPropertyToField.class.getName(); - + String resource; String property; String defaultVal; @@ -55,7 +55,7 @@ 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")); @@ -65,7 +65,7 @@ String resource = methodContext.expandString(this.resource); String property = methodContext.expandString(this.property); String defaultVal = methodContext.expandString(this.defaultVal); - + String fieldVal = null; // only run this if it is in an EVENT context 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,7 +27,7 @@ import org.ofbiz.minilang.method.*; /** - * Iff the given ID field is not valid the fail-message + * Iff the given ID field is not valid the fail-message * or fail-property sub-elements are used to add a message to the error-list. */ public class CheckId extends MethodOperation { @@ -40,9 +40,9 @@ return "check-id"; } } - + public static final String module = CheckId.class.getName(); - + String message = null; String propertyResource = null; boolean isProperty = false; @@ -94,10 +94,10 @@ // no map name, try the env fieldVal = fieldAcsr.get(methodContext); } - + String fieldStr = fieldVal.toString(); StringBuilder errorDetails = new StringBuilder(); - + //check various illegal characters, etc for ids isValid = UtilValidate.isValidDatabaseId(fieldStr, errorDetails); @@ -109,10 +109,10 @@ } public void addMessage(List<Object> messages, MethodContext methodContext, String defaultMessage, String errorDetails) { - + String message = methodContext.expandString(this.message); String propertyResource = methodContext.expandString(this.propertyResource); - + if (!isProperty && message != null) { messages.add(message + errorDetails); } else if (isProperty && propertyResource != null && message != null) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -36,7 +36,7 @@ import org.w3c.dom.Element; /** - * Iff the user does not have the specified permission the fail-message + * Iff the user does not have the specified permission the fail-message * or fail-property sub-elements are used to add a message to the error-list. */ public class CheckPermission extends MethodOperation { @@ -49,11 +49,11 @@ return "check-permission"; } } - + String message = null; String propertyResource = null; boolean isProperty = false; - + /** If null no partyId env-name will be checked against the userLogin.partyId and accepted as permission */ ContextAccessor<String> acceptUlPartyIdEnvNameAcsr = null; @@ -107,7 +107,7 @@ if (this.permissionInfo.hasPermission(methodContext, userLogin, security)) { hasPermission = true; } - + // if failed, check alternate permissions if (!hasPermission && altPermissions != null) { for (PermissionInfo altPermInfo: altPermissions) { @@ -118,7 +118,7 @@ } } } - + if (!hasPermission && acceptUlPartyIdEnvNameAcsr != null) { String acceptPartyId = (String) acceptUlPartyIdEnvNameAcsr.get(methodContext); if (UtilValidate.isEmpty(acceptPartyId)) { @@ -131,8 +131,8 @@ if (UtilValidate.isNotEmpty(acceptPartyId) && UtilValidate.isNotEmpty(userLogin.getString("partyId")) && acceptPartyId.equals(userLogin.getString("partyId"))) { hasPermission = true; } - } - + } + if (!hasPermission) { this.addMessage(messages, methodContext); } @@ -141,10 +141,10 @@ } public void addMessage(List<Object> messages, MethodContext methodContext) { - + String message = methodContext.expandString(this.message); - String propertyResource = methodContext.expandString(this.propertyResource); - + String propertyResource = methodContext.expandString(this.propertyResource); + if (!isProperty && message != null) { messages.add(message); // if (Debug.infoOn()) Debug.logInfo("[SimpleMapOperation.addMessage] Adding message: " + message, module); @@ -162,20 +162,20 @@ // if (Debug.infoOn()) Debug.logInfo("[SimpleMapOperation.addMessage] ERROR: No message found", module); } } - + public static class PermissionInfo { String permission; String action; - + public PermissionInfo(Element altPermissionElement) { this.permission = altPermissionElement.getAttribute("permission"); this.action = altPermissionElement.getAttribute("action"); } - + public boolean hasPermission(MethodContext methodContext, GenericValue userLogin, Security security) { String permission = methodContext.expandString(this.permission); String action = methodContext.expandString(this.action); - + if (action != null && action.length() > 0) { // run hasEntityPermission return security.hasEntityPermission(permission, action, userLogin); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,7 +42,7 @@ return "if-compare"; } } - + public static final String module = IfCompare.class.getName(); protected List<MethodOperation> subOps = FastList.newInstance(); @@ -80,14 +80,14 @@ } public boolean exec(MethodContext methodContext) { - // if conditions fails, always return true; if a sub-op returns false + // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true - + String value = methodContext.expandString(this.value); String operator = methodContext.expandString(this.operator); String type = methodContext.expandString(this.type); String format = methodContext.expandString(this.format); - + Object fieldVal = null; if (!mapAcsr.isEmpty()) { Map<String, ? extends Object> fromMap = mapAcsr.get(methodContext); @@ -112,7 +112,7 @@ messages.add(0, "Error with comparison in if-compare between field [" + mapAcsr.toString() + "." + fieldAcsr.toString() + "] with value [" + fieldVal + "] and value [" + value + "] with operator [" + operator + "] and type [" + type + "]: "); if (methodContext.getMethodType() == MethodContext.EVENT) { StringBuilder fullString = new StringBuilder(); - + for (Object message: messages) { fullString.append(message); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,7 +42,7 @@ return "if-compare-field"; } } - + public static final String module = IfCompareField.class.getName(); protected List<MethodOperation> subOps = FastList.newInstance(); @@ -66,7 +66,7 @@ // NOTE: this is still supported, but is deprecated this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); } - + // NOTE: this is still supported, but is deprecated this.toMapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("to-map-name")); // set fieldAcsr to their defualt value of fieldAcsr if empty @@ -77,7 +77,7 @@ } // do NOT default the to-map-name to the map-name because that - //would make it impossible to compare from a map field to an + //would make it impossible to compare from a map field to an //environment field this.operator = element.getAttribute("operator"); @@ -93,7 +93,7 @@ } public boolean exec(MethodContext methodContext) { - // if conditions fails, always return true; if a sub-op returns false + // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true String operator = methodContext.expandString(this.operator); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -40,7 +40,7 @@ return "if-empty"; } } - + public static final String module = IfEmpty.class.getName(); List<MethodOperation> subOps = FastList.newInstance(); @@ -69,7 +69,7 @@ } public boolean exec(MethodContext methodContext) { - // if conditions fails, always return true; if a sub-op returns false + // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true // return true; @@ -88,7 +88,7 @@ // no map name, try the env fieldVal = fieldAcsr.get(methodContext); } - + runSubOps = ObjectType.isEmpty(fieldVal); if (runSubOps) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -67,7 +67,7 @@ } public boolean exec(MethodContext methodContext) { - // if conditions fails, always return true; if a sub-op returns false + // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true // return true; @@ -79,7 +79,7 @@ if (userLogin != null) { String permission = methodContext.expandString(permissionExdr); String action = methodContext.expandString(actionExdr); - + Security security = methodContext.getSecurity(); if (action != null && action.length() > 0) { // run hasEntityPermission 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -40,7 +40,7 @@ return "if-not-empty"; } } - + public static final String module = IfNotEmpty.class.getName(); protected List<MethodOperation> subOps = FastList.newInstance(); @@ -70,7 +70,7 @@ } public boolean exec(MethodContext methodContext) { - // if conditions fails, always return true; if a sub-op returns false + // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true // return true; 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -43,7 +43,7 @@ return "if-regexp"; } } - + public static final String module = IfRegexp.class.getName(); static PatternMatcher matcher = new Perl5Matcher(); @@ -76,7 +76,7 @@ } public boolean exec(MethodContext methodContext) { - // if conditions fails, always return true; if a sub-op returns false + // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true String fieldString = null; 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,7 +42,7 @@ return "if-validate-method"; } } - + public static final String module = IfValidateMethod.class.getName(); List<MethodOperation> subOps = FastList.newInstance(); @@ -71,7 +71,7 @@ } public boolean exec(MethodContext methodContext) { - // if conditions fails, always return true; if a sub-op returns false + // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true String methodName = methodContext.expandString(this.methodName); 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -49,9 +49,9 @@ return "calculate"; } } - + public static final String module = Calculate.class.getName(); - + public static final BigDecimal ZERO = BigDecimal.ZERO; public static final int TYPE_DOUBLE = 1; public static final int TYPE_FLOAT = 2; @@ -116,7 +116,7 @@ } else { type = Calculate.TYPE_BIG_DECIMAL; } - + String roundingModeString = methodContext.expandString(this.roundingModeString); int roundingMode; if ("Ceiling".equals(roundingModeString)) { @@ -145,13 +145,13 @@ if (UtilValidate.isNotEmpty(decimalScaleString)) { decimalScale = Integer.valueOf(decimalScaleString).intValue(); } - + String decimalFormatString = methodContext.expandString(this.decimalFormatString); DecimalFormat df = null; if (UtilValidate.isNotEmpty(decimalFormatString)) { df = new DecimalFormat(decimalFormatString); } - + BigDecimal resultValue = ZERO; resultValue = resultValue.setScale(decimalScale, roundingMode); for (Calculate.SubCalc calcop: calcops) { @@ -159,7 +159,7 @@ // Debug.logInfo("main total so far: " + resultValue, module); } resultValue = resultValue.setScale(decimalScale, roundingMode); - + /* the old thing that did conversion to string and back, may want to use somewhere sometime...: * for now just doing the setScale above (before and after calc ops) try { @@ -175,7 +175,7 @@ return false; } */ - + Object resultObj = null; switch (type) { case TYPE_DOUBLE: @@ -193,16 +193,16 @@ resultObj = Integer.valueOf(resultValue.intValue()); break; case TYPE_STRING: - // run the decimal-formatting + // run the decimal-formatting if (df != null && resultValue.compareTo(ZERO) > 0) { resultObj = df.format(resultValue); } else { resultObj = resultValue.toString(); } - break; + break; case TYPE_BIG_DECIMAL: resultObj = resultValue; - break; + break; } if (!mapAcsr.isEmpty()) { @@ -250,7 +250,7 @@ Debug.logError(e, "Could not parse the number string: " + valueStr, module); throw new IllegalArgumentException("Could not parse the number string: " + valueStr); } - + // Debug.logInfo("calcValue number: " + value, module); return value; } @@ -310,7 +310,7 @@ } else if ("negative".equals(operatorStr)) { operator = CalcOp.OPERATOR_NEGATIVE; } - + BigDecimal resultValue = ZERO; resultValue = resultValue.setScale(scale, roundingMode); boolean isFirst = true; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -39,13 +39,13 @@ return "log"; } } - + public static final String module = Log.class.getName(); String levelStr; String message; List<MethodString> methodStrings = null; - + public Log(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); this.message = element.getAttribute("message"); @@ -54,12 +54,12 @@ List<? extends Element> methodStringElements = UtilXml.childElementList(element); if (methodStringElements.size() > 0) { methodStrings = FastList.newInstance(); - + for (Element methodStringElement: methodStringElements) { if ("string".equals(methodStringElement.getNodeName())) { - methodStrings.add(new StringString(methodStringElement, simpleMethod)); + methodStrings.add(new StringString(methodStringElement, simpleMethod)); } else if ("field".equals(methodStringElement.getNodeName())) { - methodStrings.add(new FieldString(methodStringElement, simpleMethod)); + methodStrings.add(new FieldString(methodStringElement, simpleMethod)); } else { //whoops, invalid tag here, print warning Debug.logWarning("Found an unsupported tag under the log tag: " + methodStringElement.getNodeName() + "; ignoring", module); @@ -71,7 +71,7 @@ public boolean exec(MethodContext methodContext) { String levelStr = methodContext.expandString(this.levelStr); String message = methodContext.expandString(this.message); - + int level; Integer levelInt = Debug.getLevelFromString(levelStr); if (levelInt == null) { @@ -85,7 +85,7 @@ if (!Debug.isOn(level)) { return true; } - + StringBuilder buf = new StringBuilder(); buf.append("["); String methodLocation = this.simpleMethod.getFromLocation(); @@ -97,18 +97,18 @@ buf.append("#"); buf.append(this.simpleMethod.getMethodName()); buf.append("] "); - + if (message != null) buf.append(message); - + if (methodStrings != null) { for (MethodString methodString: methodStrings) { String strValue = methodString.getString(methodContext); if (strValue != null) buf.append(strValue); } - } + } Debug.log(level, null, buf.toString(), module); - + return true; } 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -40,9 +40,9 @@ return "property-to-field"; } } - + public static final String module = PropertyToField.class.getName(); - + String resource; String property; ContextAccessor<Map<String, Object>> mapAcsr; @@ -67,7 +67,7 @@ public boolean exec(MethodContext methodContext) { String resource = methodContext.expandString(this.resource); String property = methodContext.expandString(this.property); - + String value = null; if (noLocale) { value = UtilProperties.getPropertyValue(resource, property); @@ -77,8 +77,8 @@ if (value == null || value.length() == 0) { value = defaultVal; } - - // note that expanding the value string here will handle defaultValue and the string from + + // note that expanding the value string here will handle defaultValue and the string from // the properties file; if we decide later that we don't want the string from the properties // file to be expanded we should just expand the defaultValue at the beginning of this method. value = methodContext.expandString(value); 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=757074&r1=757073&r2=757074&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 Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -38,9 +38,9 @@ return "field-to-result"; } } - + public static final String module = FieldToResult.class.getName(); - + ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; ContextAccessor<Object> resultAcsr; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,7 +25,7 @@ * Compares an in-field to the specified value */ public class Compare extends BaseCompare { - + String value; public Compare(Element element, SimpleMapProcess simpleMapProcess) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,7 +25,7 @@ * Compares the current field to another field */ public class CompareField extends BaseCompare { - + String compareName; public CompareField(Element element, SimpleMapProcess simpleMapProcess) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,7 +27,7 @@ * <p><b>Title:</b> A MakeInStringOperation that appends the specified constant string */ public class ConstantOper extends MakeInStringOperation { - + String constant; public ConstantOper(Element element) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -32,7 +32,7 @@ */ public class Convert extends SimpleMapOperation { public static final String module = Convert.class.getName(); - + String toField; String type; boolean replace = true; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,7 +25,7 @@ * Copies a field in the in-map to the out-map */ public class Copy extends SimpleMapOperation { - + boolean replace = true; boolean setIfNull = true; String toField; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,9 +27,9 @@ * A MakeInStringOperation that inserts the value of an in-field */ public class InFieldOper extends MakeInStringOperation { - + public static final String module = InFieldOper.class.getName(); - + String fieldName; public InFieldOper(Element element) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,9 +29,9 @@ * The container of MakeInString operations to make a new input String */ public class MakeInString { - + public static final String module = MakeInString.class.getName(); - + String fieldName; List<MakeInStringOperation> operations = FastList.newInstance(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInStringOperation.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInStringOperation.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInStringOperation.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInStringOperation.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -25,7 +25,7 @@ * Abstract class defining the interface to a MakeInString operation */ public abstract class MakeInStringOperation { - + public MakeInStringOperation(Element element) {} public abstract String exec(Map<String, Object> inMap, List<Object> messages, Locale locale, ClassLoader loader); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -28,7 +28,7 @@ * Map Processor Main Class */ public class MapProcessor { - + String name; List<MakeInString> makeInStrings = FastList.newInstance(); List<SimpleMapProcess> simpleMapProcesses = FastList.newInstance(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,7 +27,7 @@ * Checks to see if the current field is empty (null or zero length) */ public class NotEmpty extends SimpleMapOperation { - + public NotEmpty(Element element, SimpleMapProcess simpleMapProcess) { super(element, simpleMapProcess); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,9 +27,9 @@ * A MakeInStringOperation that insert the value of a property from a properties file */ public class PropertyOper extends MakeInStringOperation { - + public static final String module = PropertyOper.class.getName(); - + String resource; String property; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,9 +29,9 @@ * Validates the current field using a regular expression */ public class Regexp extends SimpleMapOperation { - + public static final String module = Regexp.class.getName(); - + static PatternMatcher matcher = new Perl5Matcher(); static PatternCompiler compiler = new Perl5Compiler(); Pattern pattern = null; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapOperation.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapOperation.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapOperation.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapOperation.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,7 +27,7 @@ * A single operation, does the specified operation on the given field */ public abstract class SimpleMapOperation { - + String message = null; String propertyResource = null; boolean isProperty = false; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,9 +29,9 @@ * A complete string process for a given field; contains multiple string operations */ public class SimpleMapProcess { - + public static final String module = SimpleMapProcess.class.getName(); - + List<SimpleMapOperation> simpleMapOperations = FastList.newInstance(); String field = ""; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java?rev=757074&r1=757073&r2=757074&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java Sat Mar 21 23:24:13 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,9 +29,9 @@ * A string operation that calls a validation method */ public class ValidateMethod extends SimpleMapOperation { - + public static final String module = ValidateMethod.class.getName(); - + String methodName; String className; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |