svn commit: r759238 [1/2] - in /ofbiz/trunk/framework/minilan
Locked
svn commit: r759238 [1/2] - in /ofbiz/trunk/framework/minilan
 
|
Author: doogie
Date: Fri Mar 27 16:57:48 2009 New Revision: 759238 URL: http://svn.apache.org/viewvc?rev=759238&view=rev Log: Fix lines that *only* have whitespace. Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodString.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.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/CallServiceAsynch.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/FlexibleMessage.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ConditionalFactory.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/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/envops/SetCalendar.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.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/ifops/CheckId.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInStringOperation.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapOperation.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java Fri Mar 27 16:57:48 2009 @@ -96,7 +96,7 @@ } methodOperationFactories = Collections.unmodifiableMap(mapFactories); } - + public static final String module = SimpleMethod.class.getName(); public static final String err_resource = "MiniLangErrorUiLabels"; @@ -254,7 +254,7 @@ if (UtilValidate.isEmpty(fromLocation)) { fromLocation = "<location not known>"; } - + Map<String, SimpleMethod> simpleMethods = FastMap.newInstance(); // read in the file @@ -531,7 +531,7 @@ public String getUserLoginEnvName() { return this.userLoginName; } - + public Set<String> getAllServiceNamesCalled() throws MiniLangException { Set<String> allServiceNames = FastSet.newInstance(); Set<String> simpleMethodsVisited = FastSet.newInstance(); @@ -549,7 +549,7 @@ } else if (methodOperation instanceof SetServiceFields) { String svcName = ((SetServiceFields) methodOperation).getServiceName(); if (UtilValidate.isNotEmpty(svcName)) allServiceNames.add(svcName); - + } else if (methodOperation instanceof CallSimpleMethod) { CallSimpleMethod csm = (CallSimpleMethod) methodOperation; try { @@ -630,7 +630,7 @@ } else if (methodOperation instanceof GetRelatedOne) { String relationName = ((GetRelatedOne) methodOperation).getRelationName(); if (UtilValidate.isNotEmpty(relationName)) allEntityNames.add(relationName); - + } else if (methodOperation instanceof CallSimpleMethod) { CallSimpleMethod csm = (CallSimpleMethod) methodOperation; try { @@ -681,7 +681,7 @@ // always put the null field object in as "null" methodContext.putEnv("null", GenericEntity.NULL_FIELD); methodContext.putEnv("nullField", GenericEntity.NULL_FIELD); - + methodContext.putEnv(delegatorName, methodContext.getDelegator()); methodContext.putEnv(securityName, methodContext.getSecurity()); methodContext.putEnv(dispatcherName, methodContext.getDispatcher()); @@ -693,14 +693,14 @@ methodContext.putEnv(eventSessionName, methodContext.getRequest().getSession()); methodContext.putEnv(eventResponseName, methodContext.getResponse()); } - + methodContext.putEnv("methodName", this.getMethodName()); methodContext.putEnv("methodShortDescription", this.getShortDescription()); GenericValue userLogin = methodContext.getUserLogin(); Locale locale = methodContext.getLocale(); - + if (userLogin != null) { methodContext.putEnv(userLoginName, userLogin); } @@ -754,26 +754,26 @@ finished = false; errorMsg += errMsg + "<br/>"; } - + String returnValue = null; String response = null; StringBuilder summaryErrorStringBuffer = new StringBuilder(); if (methodContext.getMethodType() == MethodContext.EVENT) { boolean forceError = false; - + String tempErrorMsg = (String) methodContext.getEnv(eventErrorMessageName); if (errorMsg.length() > 0 || (tempErrorMsg != null && tempErrorMsg.length() > 0)) { errorMsg += tempErrorMsg; methodContext.getRequest().setAttribute("_ERROR_MESSAGE_", errorMsg); forceError = true; - + summaryErrorStringBuffer.append(errorMsg); } List<Object> tempErrorMsgList = UtilGenerics.checkList(methodContext.getEnv(eventErrorMessageListName)); if (UtilValidate.isNotEmpty(tempErrorMsgList)) { methodContext.getRequest().setAttribute("_ERROR_MESSAGE_LIST_", tempErrorMsgList); forceError = true; - + summaryErrorStringBuffer.append("; "); summaryErrorStringBuffer.append(tempErrorMsgList.toString()); } @@ -803,7 +803,7 @@ returnValue = response; } else if (methodContext.getMethodType() == MethodContext.SERVICE) { boolean forceError = false; - + String tempErrorMsg = (String) methodContext.getEnv(serviceErrorMessageName); if (errorMsg.length() > 0 || (tempErrorMsg != null && tempErrorMsg.length() > 0)) { errorMsg += tempErrorMsg; @@ -817,7 +817,7 @@ if (UtilValidate.isNotEmpty(errorMsgList)) { methodContext.putResult(ModelService.ERROR_MESSAGE_LIST, errorMsgList); forceError = true; - + summaryErrorStringBuffer.append("; "); summaryErrorStringBuffer.append(errorMsgList.toString()); } @@ -826,7 +826,7 @@ if (UtilValidate.isNotEmpty(errorMsgMap)) { methodContext.putResult(ModelService.ERROR_MESSAGE_MAP, errorMsgMap); forceError = true; - + summaryErrorStringBuffer.append("; "); summaryErrorStringBuffer.append(errorMsgMap.toString()); } @@ -884,7 +884,7 @@ errorMsg += errMsg + "<br/>"; } } - + return returnValue; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java Fri Mar 27 16:57:48 2009 @@ -40,27 +40,27 @@ * <P>There should only be ONE simple-method in the XML file and it will be run as an event. */ public class SimpleMethodBsfEngine extends BSFEngineImpl { - + public static final String module = SimpleMethodBsfEngine.class.getName(); - + protected Map<String, Object> context = FastMap.newInstance(); - + public void initialize(BSFManager mgr, String lang, Vector declaredBeans) throws BSFException { super.initialize(mgr, lang, declaredBeans); - + // declare the bsf manager for callbacks, etc. context.put("bsf", mgr); - + for(int i=0; i<declaredBeans.size(); i++) { BSFDeclaredBean bean = (BSFDeclaredBean)declaredBeans.get(i); declareBean(bean); } } - + public void setDebug(boolean debug) { //interpreter.DEBUG=debug; } - + /** * Invoke method name on the specified scripted object. * The object may be null to indicate the global namespace of the @@ -70,8 +70,8 @@ public Object call(Object object, String name, Object[] args) throws BSFException { throw new BSFException("The call method is not yet supported for SimpleMethods"); } - - + + /** * This is an implementation of the apply() method. * It exectutes the funcBody text in an "anonymous" method call with @@ -80,10 +80,10 @@ public Object apply(String source, int lineNo, int columnNo, Object funcBody, Vector namesVec, Vector argsVec) throws BSFException { //if (namesVec.size() != argsVec.size()) throw new BSFException("number of params/names mismatch"); //if (!(funcBody instanceof String)) throw new BSFException("apply: function body must be a string"); - + throw new BSFException("The apply method is not yet supported for simple-methods"); } - + public Object eval(String source, int lineNo, int columnNo, Object expr) throws BSFException { if (!(expr instanceof String)) throw new BSFException("simple-method expression must be a string"); @@ -105,35 +105,35 @@ return simpleMethod.exec(methodContext); //methodContext.getResults(); } - - + + public void exec(String source, int lineNo, int columnNo, Object script) throws BSFException { eval(source, lineNo, columnNo, script); } - - + + /* public void compileApply (String source, int lineNo, int columnNo, Object funcBody, Vector paramNames, Vector arguments, CodeBuffer cb) throws BSFException; - + public void compileExpr (String source, int lineNo, int columnNo, Object expr, CodeBuffer cb) throws BSFException; - + public void compileScript (String source, int lineNo, int columnNo, Object script, CodeBuffer cb) throws BSFException; */ - + public void declareBean(BSFDeclaredBean bean) throws BSFException { context.put(bean.name, bean.bean); } - + public void undeclareBean(BSFDeclaredBean bean) throws BSFException { context.remove(bean.name); } - + public void terminate() { } - + private String sourceInfo(String source, int lineNo, int columnNo) { return "SimpleMethod: " + source + " at line: " + lineNo +" column: " + columnNo; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java Fri Mar 27 16:57:48 2009 @@ -36,7 +36,7 @@ public ContextAccessor(String name) { init(name); } - + public ContextAccessor(String name, String defaultName) { if (name == null || name.length() == 0) { init(defaultName); @@ -44,21 +44,21 @@ init(name); } } - + protected void init(String name) { this.name = name; this.fma = FlexibleMapAccessor.getInstance(name); } - + public boolean isEmpty() { return this.fma.isEmpty(); } - + /** Based on name get from Map or from List in Map */ public T get(MethodContext methodContext) { return UtilGenerics.<T>cast(methodContext.getEnv(fma)); } - + /** Based on name put in Map or from List in Map; * If the brackets for a list are empty the value will be appended to the list, * otherwise the value will be set in the position of the number in the brackets. @@ -68,17 +68,17 @@ public void put(MethodContext methodContext, T value) { methodContext.putEnv(fma, value); } - + /** Based on name remove from Map or from List in Map */ public T remove(MethodContext methodContext) { return UtilGenerics.<T>cast(methodContext.removeEnv(fma)); } - + /** Based on name get from Map or from List in Map */ public T get(Map<String, ? extends Object> theMap, MethodContext methodContext) { return fma.get(theMap); } - + /** Based on name put in Map or from List in Map; * If the brackets for a list are empty the value will be appended to the list, * otherwise the value will be set in the position of the number in the brackets. @@ -88,12 +88,12 @@ public void put(Map<String, Object> theMap, T value, MethodContext methodContext) { fma.put(theMap, value); } - + /** Based on name remove from Map or from List in Map */ public T remove(Map<String, ? extends Object> theMap, MethodContext methodContext) { return fma.remove(theMap); } - + /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key */ public int hashCode() { return this.name.hashCode(); 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=759238&r1=759237&r2=759238&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 Fri Mar 27 16:57:48 2009 @@ -28,9 +28,9 @@ * A type of MethodObject that represents an Object value in a certain location */ public class FieldObject<T> extends MethodObject<T> { - + public static final String module = FieldObject.class.getName(); - + ContextAccessor<T> fieldAcsr; ContextAccessor<Map<String, ? extends Object>> mapAcsr; String type; @@ -40,7 +40,7 @@ // 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"; @@ -51,7 +51,7 @@ public String getTypeName() { return type; } - + public Class<T> getTypeClass(ClassLoader loader) { try { return UtilGenerics.cast(ObjectType.loadClass(type, loader)); @@ -60,7 +60,7 @@ return null; } } - + public T getObject(MethodContext methodContext) { T fieldVal = null; @@ -80,7 +80,7 @@ if (Debug.infoOn()) Debug.logInfo("Field value not found with name " + fieldAcsr + " in Map with name " + mapAcsr + ", not getting Object value, returning null.", module); return null; } - + return fieldVal; } } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java Fri Mar 27 16:57:48 2009 @@ -28,9 +28,9 @@ * A type of MethodString that represents a String constant value */ public class FieldString extends MethodString { - + public static final String module = FieldString.class.getName(); - + ContextAccessor<Object> fieldAcsr; ContextAccessor<Map<String, ? extends Object>> mapAcsr; @@ -58,7 +58,7 @@ if (Debug.infoOn()) Debug.logInfo("Field value not found with name " + fieldAcsr + " in Map with name " + mapAcsr + ", not getting string value", module); return ""; } - + return fieldVal.toString(); } } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java Fri Mar 27 16:57:48 2009 @@ -44,7 +44,7 @@ * A single operation, does the specified operation on the given field */ public class MethodContext implements Iterable<Map.Entry<String, Object>> { - + public static final int EVENT = 1; public static final int SERVICE = 2; @@ -130,7 +130,7 @@ this.response = (HttpServletResponse) context.get("response"); if (this.locale == null) this.locale = UtilHttp.getLocale(request); if (this.timeZone == null) this.timeZone = UtilHttp.getTimeZone(request); - + //make sure the delegator and other objects are in place, getting from // request if necessary; assumes this came through the ControlServlet // or something similar @@ -143,7 +143,7 @@ } else if (methodType == MethodContext.SERVICE) { this.results = FastMap.newInstance(); } - + if (this.loader == null) { try { this.loader = Thread.currentThread().getContextClassLoader(); @@ -152,7 +152,7 @@ } } } - + public void setErrorReturn(String errMsg, SimpleMethod simpleMethod) { if (getMethodType() == MethodContext.EVENT) { putEnv(simpleMethod.getEventErrorMessageName(), errMsg); @@ -170,7 +170,7 @@ public Map<String, Object> getEnvMap() { return this.env; } - + /** Gets the named value from the environment. Supports the "." (dot) syntax to access Map members and the * "[]" (bracket) syntax to access List entries. This value is expanded, supporting the insertion of other * environment values using the "${}" notation. @@ -255,7 +255,7 @@ public ClassLoader getLoader() { return this.loader; } - + public Locale getLocale() { return this.locale; } @@ -304,7 +304,7 @@ public Map<String, Object> getResults() { return this.results; } - + /** Expands environment variables delimited with ${} */ public String expandString(String original) { return FlexibleStringExpander.expandString(original, this.env); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodObject.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodObject.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodObject.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodObject.java Fri Mar 27 16:57:48 2009 @@ -25,7 +25,7 @@ * A single Object value to be used as a parameter or whatever */ public abstract class MethodObject<T> { - + protected SimpleMethod simpleMethod; public MethodObject(Element element, SimpleMethod simpleMethod) { @@ -34,10 +34,10 @@ /** Get the name for the type of the object */ public abstract String getTypeName(); - + /** Get the Class for the type of the object */ public abstract Class<T> getTypeClass(ClassLoader loader); - + /** Get the Object value */ public abstract T getObject(MethodContext methodContext); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodOperation.java Fri Mar 27 16:57:48 2009 @@ -41,13 +41,13 @@ public @interface DeprecatedOperation { String value(); } - + protected SimpleMethod simpleMethod; public MethodOperation(Element element, SimpleMethod simpleMethod) { this.simpleMethod = simpleMethod; } - + public SimpleMethod getSimpleMethod() { return this.simpleMethod; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodString.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodString.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodString.java Fri Mar 27 16:57:48 2009 @@ -25,7 +25,7 @@ * A single String value, generally meant to be combined with others */ public abstract class MethodString { - + protected SimpleMethod simpleMethod; public MethodString(Element element, SimpleMethod simpleMethod) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java Fri Mar 27 16:57:48 2009 @@ -27,7 +27,7 @@ * A type of MethodObject that represents a String constant value to be used as an Object */ public class StringObject extends MethodObject<String> { - + String value; String cdataValue; @@ -41,18 +41,18 @@ public String getTypeName() { return "java.lang.String"; } - + public Class<String> getTypeClass(ClassLoader loader) { return java.lang.String.class; } - + public String getObject(MethodContext methodContext) { String value = methodContext.expandString(this.value); String cdataValue = methodContext.expandString(this.cdataValue); - + boolean valueExists = UtilValidate.isNotEmpty(value); boolean cdataValueExists = UtilValidate.isNotEmpty(cdataValue); - + if (valueExists && cdataValueExists) { return value + cdataValue; } else { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java Fri Mar 27 16:57:48 2009 @@ -26,7 +26,7 @@ * A type of MethodString that represents a String constant value */ public class StringString extends MethodString { - + String value; String cdataValue; @@ -39,10 +39,10 @@ public String getString(MethodContext methodContext) { String value = methodContext.expandString(this.value); String cdataValue = methodContext.expandString(this.cdataValue); - + boolean valueExists = UtilValidate.isNotEmpty(value); boolean cdataValueExists = UtilValidate.isNotEmpty(cdataValue); - + if (valueExists && cdataValueExists) { return value + cdataValue; } else { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java Fri Mar 27 16:57:48 2009 @@ -78,7 +78,7 @@ public void addMessage(List<Object> messages, ClassLoader loader, MethodContext methodContext) { String message = methodContext.expandString(this.message); String propertyResource = methodContext.expandString(this.propertyResource); - + if (!isProperty && message != null) { messages.add(message); // if (Debug.infoOn()) Debug.logInfo("[SimpleMapOperation.addMessage] Adding message: " + message, module); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java Fri Mar 27 16:57:48 2009 @@ -43,9 +43,9 @@ return "call-bsh"; } } - + public static final String module = CallBsh.class.getName(); - + public static final int bufferLength = 4096; String inline = null; 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=759238&r1=759237&r2=759238&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 Fri Mar 27 16:57:48 2009 @@ -42,7 +42,7 @@ return "call-class-method"; } } - + public static final String module = CallClassMethod.class.getName(); String className; @@ -60,11 +60,11 @@ // 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); if (parameterElements.size() > 0) { parameters = FastList.newInstance(); - + for (Element parameterElement: parameterElements) { MethodObject<?> methodObject = null; if ("string".equals(parameterElement.getNodeName())) { @@ -85,7 +85,7 @@ public boolean exec(MethodContext methodContext) { String className = methodContext.expandString(this.className); String methodName = methodContext.expandString(this.methodName); - + Class<?> methodClass = null; try { methodClass = ObjectType.loadClass(className, methodContext.getLoader()); @@ -96,7 +96,7 @@ methodContext.setErrorReturn(errMsg, simpleMethod); return false; } - + return CallObjectMethod.callMethod(simpleMethod, methodContext, parameters, methodClass, null, methodName, retFieldAcsr, retMapAcsr); } 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=759238&r1=759237&r2=759238&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 Fri Mar 27 16:57:48 2009 @@ -43,7 +43,7 @@ return "call-object-method"; } } - + public static final String module = CallClassMethod.class.getName(); ContextAccessor<Object> objFieldAcsr; @@ -60,17 +60,17 @@ // 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"); - + // 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); if (parameterElements.size() > 0) { parameters = FastList.newInstance(); - + for (Element parameterElement: parameterElements) { MethodObject methodObject = null; if ("string".equals(parameterElement.getNodeName())) { @@ -96,7 +96,7 @@ Map<String, ? extends Object> fromMap = objMapAcsr.get(methodContext); if (fromMap == null) { Debug.logWarning("Map not found with name " + objMapAcsr + ", which should contain the object to execute a method on; not executing method, rerturning error.", module); - + String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [Map not found with name " + objMapAcsr + ", which should contain the object to execute a method on]"; methodContext.setErrorReturn(errMsg, simpleMethod); return false; @@ -109,7 +109,7 @@ if (methodObject == null) { if (Debug.infoOn()) Debug.logInfo("Object not found to execute method on with name " + objFieldAcsr + " in Map with name " + objMapAcsr + ", not executing method, rerturning error.", module); - + String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [Object not found to execute method on with name " + objFieldAcsr + " in Map with name " + objMapAcsr + "]"; methodContext.setErrorReturn(errMsg, simpleMethod); return false; @@ -118,7 +118,7 @@ Class<?> methodClass = methodObject.getClass(); return CallObjectMethod.callMethod(simpleMethod, methodContext, parameters, methodClass, methodObject, methodName, retFieldAcsr, retMapAcsr); } - + public static boolean callMethod(SimpleMethod simpleMethod, MethodContext methodContext, List<MethodObject<?>> parameters, Class<?> methodClass, Object methodObject, String methodName, ContextAccessor<Object> retFieldAcsr, ContextAccessor<Map<String, Object>> retMapAcsr) { Object[] args = null; Class<?>[] parameterTypes = null; @@ -126,7 +126,7 @@ if (parameters != null) { args = new Object[parameters.size()]; parameterTypes = new Class<?>[parameters.size()]; - + int i = 0; for (MethodObject<?> methodObjectDef: parameters) { args[i] = methodObjectDef.getObject(methodContext); @@ -143,12 +143,12 @@ i++; } } - + try { Method method = methodClass.getMethod(methodName, parameterTypes); try { Object retValue = method.invoke(methodObject, args); - + //if retFieldAcsr is empty, ignore return value if (!retFieldAcsr.isEmpty()) { if (!retMapAcsr.isEmpty()) { @@ -191,7 +191,7 @@ methodContext.setErrorReturn(errMsg, simpleMethod); return false; } - + return true; } 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=759238&r1=759237&r2=759238&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 Fri Mar 27 16:57:48 2009 @@ -53,16 +53,16 @@ return "call-service"; } } - + public static final String module = CallService.class.getName(); - + protected String serviceName; protected ContextAccessor<Map<String, Object>> inMapAcsr; protected String includeUserLoginStr; protected String breakOnErrorStr; protected String errorCode; protected String successCode; - + /** Require a new transaction for this service */ protected String requireNewTransactionStr; /** Override the default transaction timeout, only works if we start the transaction */ @@ -112,7 +112,7 @@ } } this.transactionTimeout = timeout; - + successCode = element.getAttribute("success-code"); if (successCode == null || successCode.length() == 0) successCode = "success"; @@ -174,7 +174,7 @@ } } } - + public String getServiceName() { return this.serviceName; } @@ -182,7 +182,7 @@ public boolean exec(MethodContext methodContext) { boolean includeUserLogin = !"false".equals(methodContext.expandString(includeUserLoginStr)); boolean breakOnError = !"false".equals(methodContext.expandString(breakOnErrorStr)); - + String serviceName = methodContext.expandString(this.serviceName); String errorCode = methodContext.expandString(this.errorCode); @@ -221,7 +221,7 @@ inMap.put("userLogin", userLogin); } } - + // always add Locale to context unless null Locale locale = methodContext.getLocale(); if (locale != null) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java Fri Mar 27 16:57:48 2009 @@ -45,9 +45,9 @@ return "call-service-asynch"; } } - + public static final String module = CallServiceAsynch.class.getName(); - + protected String serviceName; protected ContextAccessor<Map<String, Object>> inMapAcsr; protected String includeUserLoginStr; @@ -62,7 +62,7 @@ public boolean exec(MethodContext methodContext) { String serviceName = methodContext.expandString(this.serviceName); boolean includeUserLogin = !"false".equals(methodContext.expandString(includeUserLoginStr)); - + Map<String, Object> inMap = null; if (inMapAcsr.isEmpty()) { inMap = FastMap.newInstance(); @@ -82,13 +82,13 @@ inMap.put("userLogin", userLogin); } } - + // always add Locale to context unless null Locale locale = methodContext.getLocale(); if (locale != null) { inMap.put("locale", locale); } - + // invoke the service try { methodContext.getDispatcher().runAsync(serviceName, inMap); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java Fri Mar 27 16:57:48 2009 @@ -42,7 +42,7 @@ return "call-map-processor"; } } - + String xmlResource; String processorName; ContextAccessor<Map<String, Object>> inMapAcsr; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java Fri Mar 27 16:57:48 2009 @@ -40,9 +40,9 @@ return "call-simple-method"; } } - + public static final String module = CallSimpleMethod.class.getName(); - + String xmlResource; String methodName; @@ -51,11 +51,11 @@ this.methodName = element.getAttribute("method-name"); this.xmlResource = element.getAttribute("xml-resource"); } - + public String getXmlResource() { return this.xmlResource; } - + public String getMethodName() { return this.methodName; } @@ -80,10 +80,10 @@ methodContext.setErrorReturn(errMsg, simpleMethod); return false; } - + String returnVal = simpleMethodToCall.exec(methodContext); if (Debug.verboseOn()) Debug.logVerbose("Called inline simple-method named [" + methodName + "] in resource [" + xmlResource + "], returnVal is [" + returnVal + "]", module); - + if (returnVal != null && returnVal.equals(simpleMethodToCall.getDefaultErrorCode())) { // in this case just set the error code just in case it hasn't already been set, the error messages will already be in place... if (methodContext.getMethodType() == MethodContext.EVENT) { @@ -93,7 +93,7 @@ } return false; } - + // if the response code/message is error, if so show the error and return false if (methodContext.getMethodType() == MethodContext.EVENT) { String responseCode = (String) methodContext.getEnv(simpleMethod.getEventResponseCodeName()); @@ -117,7 +117,7 @@ return true; } - + public SimpleMethod getSimpleMethodToCall(ClassLoader loader) throws MiniLangException { SimpleMethod simpleMethodToCall = null; if (xmlResource == null || xmlResource.length() == 0) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java Fri Mar 27 16:57:48 2009 @@ -41,7 +41,7 @@ return "check-errors"; } } - + ContextAccessor<List<Object>> errorListAcsr; String errorCode; @@ -54,7 +54,7 @@ super(element, simpleMethod); errorCode = element.getAttribute("error-code"); if (errorCode == null || errorCode.length() == 0) errorCode = "error"; - + errorListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("error-list-name"), "error_list"); errorPrefix = new FlexibleMessage(UtilXml.firstChildElement(element, "error-prefix"), "check.error.prefix"); @@ -68,7 +68,7 @@ if (UtilValidate.isNotEmpty(messages)) { String errorCode = methodContext.expandString(this.errorCode); - + if (methodContext.getMethodType() == MethodContext.EVENT) { /* The OLD way, now puts formatting control in the template... String errMsg = errorPrefix.getMessage(methodContext.getLoader(), methodContext) + 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=759238&r1=759237&r2=759238&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 Fri Mar 27 16:57:48 2009 @@ -43,7 +43,7 @@ return "create-object"; } } - + public static final String module = CreateObject.class.getName(); String className; @@ -56,11 +56,11 @@ public CreateObject(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); className = element.getAttribute("class-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); if (parameterElements.size() > 0) { parameters = FastList.newInstance(); @@ -94,7 +94,7 @@ methodContext.setErrorReturn(errMsg, simpleMethod); return false; } - + Object[] args = null; Class<?>[] parameterTypes = null; if (parameters != null) { @@ -117,12 +117,12 @@ i++; } } - + try { Constructor constructor = methodClass.getConstructor(parameterTypes); try { Object newObject = constructor.newInstance(args); - + //if fieldAcsr is empty, ignore return value if (!fieldAcsr.isEmpty()) { if (!mapAcsr.isEmpty()) { @@ -165,18 +165,18 @@ } } catch (NoSuchMethodException e) { Debug.logError(e, "Could not find constructor to execute in simple-method create-object operation", module); - + String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [Could not find constructor to execute: " + e.toString() + "]"; methodContext.setErrorReturn(errMsg, simpleMethod); return false; } catch (SecurityException e) { Debug.logError(e, "Security exception finding constructor to execute in simple-method create-object operation", module); - + String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [Security exception finding constructor to execute: " + e.toString() + "]"; methodContext.setErrorReturn(errMsg, simpleMethod); return false; } - + return true; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/FlexibleMessage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/FlexibleMessage.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/FlexibleMessage.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/FlexibleMessage.java Fri Mar 27 16:57:48 2009 @@ -29,9 +29,9 @@ * Simple class to wrap messages that come either from a straight string or a properties file */ public class FlexibleMessage implements Serializable { - + public static final String module = FlexibleMessage.class.getName(); - + String message = null; String propertyResource = null; boolean isProperty = false; @@ -65,7 +65,7 @@ public String getMessage(ClassLoader loader, MethodContext methodContext) { String message = methodContext.expandString(this.message); String propertyResource = methodContext.expandString(this.propertyResource); - + // if (Debug.infoOn()) Debug.logInfo("[FlexibleMessage.getMessage] isProperty: " + isProperty + ", message: " + message + ", propertyResource: " + propertyResource, module); if (!isProperty && message != null) { // if (Debug.infoOn()) Debug.logInfo("[FlexibleMessage.getMessage] Adding message: " + message, module); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java Fri Mar 27 16:57:48 2009 @@ -36,7 +36,7 @@ return "return"; } } - + String responseCode; public Return(Element element, SimpleMethod simpleMethod) { @@ -48,7 +48,7 @@ public boolean exec(MethodContext methodContext) { String responseCode = methodContext.expandString(this.responseCode); - + if (methodContext.getMethodType() == MethodContext.EVENT) { methodContext.putEnv(simpleMethod.getEventResponseCodeName(), responseCode); return false; 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=759238&r1=759237&r2=759238&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 Fri Mar 27 16:57:48 2009 @@ -53,9 +53,9 @@ return "set-service-fields"; } } - + public static final String module = CallService.class.getName(); - + String serviceName; ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Map<String, Object>> toMapAcsr; @@ -89,7 +89,7 @@ toMap = FastMap.newInstance(); toMapAcsr.put(methodContext, toMap); } - + LocalDispatcher dispatcher = methodContext.getDispatcher(); ModelService modelService = null; try { @@ -115,18 +115,18 @@ value = null; } } - + toMap.put(modelParam.name, value); } } - + return true; } public String getServiceName() { return this.serviceName; } - + public String rawString() { // TODO: something more than the empty tag return "<set-service-fields/>"; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java Fri Mar 27 16:57:48 2009 @@ -59,7 +59,7 @@ errorListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("error-list-name"), "error_list"); titleExdr = FlexibleStringExpander.getInstance(element.getAttribute("title")); - + for (Element conditionalElement: UtilXml.childElementList(element)) { this.conditionalList.add(ConditionalFactory.makeConditional(conditionalElement, simpleMethod)); } @@ -73,11 +73,11 @@ } String title = this.titleExdr.expandString(methodContext.getEnvMap()); - + // check each conditional and if fails generate a message to add to the error list for (Conditional condition: conditionalList) { boolean conditionTrue = condition.checkCondition(methodContext); - + if (!conditionTrue) { // pretty print condition StringBuilder messageBuffer = new StringBuilder(); @@ -99,7 +99,7 @@ public String rawString() { return expandedString(null); } - + public String expandedString(MethodContext methodContext) { String title = this.titleExdr.expandString(methodContext.getEnvMap()); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java Fri Mar 27 16:57:48 2009 @@ -68,7 +68,7 @@ return "not"; } } - + public static final int OR = 1; public static final int XOR = 2; public static final int AND = 3; @@ -77,7 +77,7 @@ SimpleMethod simpleMethod; int conditionType; List<Conditional> subConditions = FastList.newInstance(); - + public CombinedCondition(Element element, int conditionType, SimpleMethod simpleMethod) { this.simpleMethod = simpleMethod; this.conditionType = conditionType; @@ -88,7 +88,7 @@ public boolean checkCondition(MethodContext methodContext) { if (subConditions.size() == 0) return true; - + Iterator<Conditional> subCondIter = subConditions.iterator(); switch (this.conditionType) { case OR: Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java Fri Mar 27 16:57:48 2009 @@ -41,11 +41,11 @@ } } - + public static final String module = CompareCondition.class.getName(); - + SimpleMethod simpleMethod; - + ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; String value; @@ -53,10 +53,10 @@ String operator; String type; String format; - + public CompareCondition(Element element, SimpleMethod simpleMethod) { this.simpleMethod = simpleMethod; - + // NOTE: this is still supported, but is deprecated this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field")); @@ -76,7 +76,7 @@ String operator = methodContext.expandString(this.operator); String type = methodContext.expandString(this.type); String format = methodContext.expandString(this.format); - + Object fieldVal = getFieldVal(methodContext); List<Object> messages = FastList.newInstance(); @@ -85,7 +85,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); } @@ -99,12 +99,12 @@ } return false; } - + if (resultBool != null) return resultBool.booleanValue(); - + return false; } - + protected Object getFieldVal(MethodContext methodContext) { Object fieldVal = null; if (!mapAcsr.isEmpty()) { @@ -132,7 +132,7 @@ String type = methodContext.expandString(this.type); String format = methodContext.expandString(this.format); Object fieldVal = getFieldVal(methodContext); - + messageBuffer.append("["); if (!this.mapAcsr.isEmpty()) { messageBuffer.append(this.mapAcsr); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java Fri Mar 27 16:57:48 2009 @@ -40,11 +40,11 @@ } } - + public static final String module = CompareFieldCondition.class.getName(); - + SimpleMethod simpleMethod; - + ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; ContextAccessor<Map<String, ? extends Object>> toMapAcsr; @@ -53,10 +53,10 @@ String operator; String type; String format; - + public CompareFieldCondition(Element element, SimpleMethod simpleMethod) { this.simpleMethod = simpleMethod; - + // NOTE: this is still supported, but is deprecated this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field")); @@ -64,7 +64,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 default value of fieldAcsr if empty @@ -112,12 +112,12 @@ } return false; } - + if (resultBool != null) return resultBool.booleanValue(); - + return false; } - + protected Object getFieldVal1(MethodContext methodContext) { Object fieldVal1 = null; if (!mapAcsr.isEmpty()) { @@ -149,7 +149,7 @@ } return fieldVal2; } - + public void prettyPrint(StringBuilder messageBuffer, MethodContext methodContext) { String operator = methodContext.expandString(this.operator); String type = methodContext.expandString(this.type); @@ -157,7 +157,7 @@ Object fieldVal1 = getFieldVal1(methodContext); Object fieldVal2 = getFieldVal2(methodContext); - + messageBuffer.append("["); if (!this.mapAcsr.isEmpty()) { messageBuffer.append(this.mapAcsr); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ConditionalFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ConditionalFactory.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ConditionalFactory.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ConditionalFactory.java Fri Mar 27 16:57:48 2009 @@ -43,12 +43,12 @@ } conditionalFactories = Collections.unmodifiableMap(factories); } - + public static final String module = ConditionalFactory.class.getName(); - + public static Conditional makeConditional(Element element, SimpleMethod simpleMethod) { String tagName = element.getTagName(); - + ConditionalFactory factory = conditionalFactories.get(tagName); if (factory != null) { return factory.createCondition(element, simpleMethod); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ElseIf.java Fri Mar 27 16:57:48 2009 @@ -39,11 +39,11 @@ Element conditionElement = UtilXml.firstChildElement(element, "condition"); Element conditionChildElement = UtilXml.firstChildElement(conditionElement); this.condition = ConditionalFactory.makeConditional(conditionChildElement, simpleMethod); - + Element thenElement = UtilXml.firstChildElement(element, "then"); SimpleMethod.readOperations(thenElement, thenSubOps, simpleMethod); } - + public List<MethodOperation> getThenSubOps() { return this.thenSubOps; } @@ -51,7 +51,7 @@ public boolean checkCondition(MethodContext methodContext) { return condition.checkCondition(methodContext); } - + public boolean runSubOps(MethodContext methodContext) { return SimpleMethod.runSubOps(thenSubOps, methodContext); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java Fri Mar 27 16:57:48 2009 @@ -38,17 +38,17 @@ } } - + public static final String module = EmptyCondition.class.getName(); - + SimpleMethod simpleMethod; - + ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; - + public EmptyCondition(Element element, SimpleMethod simpleMethod) { this.simpleMethod = simpleMethod; - + // NOTE: this is still supported, but is deprecated this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field")); @@ -86,10 +86,10 @@ } } } - + return runSubOps; } - + protected Object getFieldVal(MethodContext methodContext) { Object fieldVal = null; if (!mapAcsr.isEmpty()) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java Fri Mar 27 16:57:48 2009 @@ -39,15 +39,15 @@ } } - + SimpleMethod simpleMethod; - + String permission; String action; - + public HasPermissionCondition(Element element, SimpleMethod simpleMethod) { this.simpleMethod = simpleMethod; - + this.permission = element.getAttribute("permission"); this.action = element.getAttribute("action"); } @@ -61,7 +61,7 @@ if (userLogin != null) { String permission = methodContext.expandString(this.permission); String action = methodContext.expandString(this.action); - + Security security = methodContext.getSecurity(); if (action != null && action.length() > 0) { // run hasEntityPermission @@ -75,7 +75,7 @@ } } } - + return runSubOps; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java Fri Mar 27 16:57:48 2009 @@ -50,14 +50,14 @@ public MasterIf(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); - + Element conditionElement = UtilXml.firstChildElement(element, "condition"); Element conditionChildElement = UtilXml.firstChildElement(conditionElement); this.condition = ConditionalFactory.makeConditional(conditionChildElement, simpleMethod); - + Element thenElement = UtilXml.firstChildElement(element, "then"); SimpleMethod.readOperations(thenElement, thenSubOps, simpleMethod); - + List<? extends Element> elseIfElements = UtilXml.childElementList(element, "else-if"); if (UtilValidate.isNotEmpty(elseIfElements)) { elseIfs = FastList.newInstance(); @@ -65,7 +65,7 @@ elseIfs.add(new ElseIf(elseIfElement, simpleMethod)); } } - + Element elseElement = UtilXml.firstChildElement(element, "else"); if (elseElement != null) { elseSubOps = FastList.newInstance(); @@ -92,7 +92,7 @@ } } } - + if (elseSubOps != null) { return SimpleMethod.runSubOps(elseSubOps, methodContext); } else { @@ -110,7 +110,7 @@ allSubOps.addAll(elseIf.getThenSubOps()); } } - + return allSubOps; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java Fri Mar 27 16:57:48 2009 @@ -53,11 +53,11 @@ } } - + public static final String module = RegexpCondition.class.getName(); - + SimpleMethod simpleMethod; - + static PatternMatcher matcher = new Perl5Matcher(); static PatternCompiler compiler = new Perl5Compiler(); @@ -68,10 +68,10 @@ ContextAccessor<Object> fieldAcsr; FlexibleStringExpander exprExdr; - + public RegexpCondition(Element element, SimpleMethod simpleMethod) { this.simpleMethod = simpleMethod; - + // NOTE: this is still supported, but is deprecated this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field")); @@ -101,7 +101,7 @@ return false; } } - + protected String getFieldString(MethodContext methodContext) { String fieldString = null; Object fieldVal = null; @@ -127,7 +127,7 @@ } // always use an empty string by default if (fieldString == null) fieldString = ""; - + return fieldString; } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java Fri Mar 27 16:57:48 2009 @@ -39,14 +39,14 @@ } } - + public static final String module = ValidateMethodCondition.class.getName(); - + ContextAccessor<Map<String, ? extends Object>> mapAcsr; ContextAccessor<Object> fieldAcsr; String methodName; String className; - + public ValidateMethodCondition(Element element) { this.mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name")); this.fieldAcsr = new ContextAccessor<Object>(element.getAttribute("field-name")); @@ -85,12 +85,12 @@ } catch (Exception e) { Debug.logError(e, "Error in IfValidationMethod " + methodName + " of class " + className + ", not processing sub-ops ", module); } - + if (resultBool != null) return resultBool.booleanValue(); - + return false; } - + protected String getFieldString(MethodContext methodContext) { String fieldString = null; Object fieldVal = null; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java Fri Mar 27 16:57:48 2009 @@ -49,11 +49,11 @@ public While(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); - + Element conditionElement = UtilXml.firstChildElement(element, "condition"); Element conditionChildElement = UtilXml.firstChildElement(conditionElement); this.condition = ConditionalFactory.makeConditional(conditionChildElement, simpleMethod); - + Element thenElement = UtilXml.firstChildElement(element, "then"); SimpleMethod.readOperations(thenElement, thenSubOps, simpleMethod); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java Fri Mar 27 16:57:48 2009 @@ -39,9 +39,9 @@ return "clear-cache-line"; } } - + public static final String module = ClearCacheLine.class.getName(); - + String entityName; ContextAccessor<Map<String, ? extends Object>> mapAcsr; @@ -53,7 +53,7 @@ public boolean exec(MethodContext methodContext) { String entityName = methodContext.expandString(this.entityName); - + if (mapAcsr.isEmpty()) { methodContext.getDelegator().clearCacheLine(entityName); } else { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java Fri Mar 27 16:57:48 2009 @@ -39,9 +39,9 @@ return "clone-value"; } } - + public static final String module = CloneValue.class.getName(); - + ContextAccessor<GenericValue> valueAcsr; ContextAccessor<GenericValue> newValueAcsr; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java Fri Mar 27 16:57:48 2009 @@ -40,9 +40,9 @@ return "create-value"; } } - + public static final String module = CreateValue.class.getName(); - + ContextAccessor<GenericValue> valueAcsr; String doCacheClearStr; boolean testDuplicate; @@ -57,7 +57,7 @@ public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); - + GenericValue value = valueAcsr.get(methodContext); if (value == null) { String errMsg = "In create-value a value was not found with the specified valueAcsr: " + valueAcsr + ", not creating"; @@ -78,7 +78,7 @@ methodContext.getDelegator().create(value, doCacheClear); } } catch (GenericEntityException e) { - + Debug.logError(e, module); String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [problem creating the " + valueAcsr + " value: " + e.getMessage() + "]"; if (methodContext.getMethodType() == MethodContext.EVENT) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java Fri Mar 27 16:57:48 2009 @@ -40,9 +40,9 @@ return "entity-and"; } } - + public static final String module = EntityAnd.class.getName(); - + protected ByAndFinder finder; public EntityAnd(Element element, SimpleMethod simpleMethod) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java Fri Mar 27 16:57:48 2009 @@ -40,9 +40,9 @@ return "entity-condition"; } } - + public static final String module = EntityCondition.class.getName(); - + protected ByConditionFinder finder; public EntityCondition(Element element, SimpleMethod simpleMethod) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java Fri Mar 27 16:57:48 2009 @@ -50,9 +50,9 @@ return "entity-count"; } } - + public static final String module = EntityCount.class.getName(); - + protected FlexibleStringExpander entityNameExdr; protected FlexibleStringExpander delegatorNameExdr; protected Condition whereCondition; @@ -68,7 +68,7 @@ } else { this.countAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("count-name")); } - + // process condition-expr | condition-list Element conditionExprElement = UtilXml.firstChildElement(element, "condition-expr"); Element conditionListElement = UtilXml.firstChildElement(element, "condition-list"); @@ -83,7 +83,7 @@ } else if (conditionObjectElement != null) { this.whereCondition = new ConditionObject(conditionObjectElement); } - + // process having-condition-list Element havingConditionListElement = UtilXml.firstChildElement(element, "having-condition-list"); if (havingConditionListElement != null) { @@ -97,7 +97,7 @@ GenericDelegator delegator = methodContext.getDelegator(); String entityName = this.entityNameExdr.expandString(context); String delegatorName = this.delegatorNameExdr.expandString(context); - + if (delegatorName != null && delegatorName.length() > 0) { delegator = GenericDelegator.getGenericDelegator(delegatorName); } @@ -113,9 +113,9 @@ if (this.havingCondition != null) { havingEntityCondition = this.havingCondition.createCondition(context, entityName, delegator); } - + long count = delegator.findCountByCondition(entityName, whereEntityCondition, havingEntityCondition, null); - + this.countAcsr.put(context, count); } catch (GeneralException e) { Debug.logError(e, module); @@ -139,7 +139,7 @@ if (entName.indexOf("${") >= 0) return null; return entName; } - + public String rawString() { // TODO: something more than the empty tag return "<entity-count/>"; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java?rev=759238&r1=759237&r2=759238&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java Fri Mar 27 16:57:48 2009 @@ -51,9 +51,9 @@ return "entity-data"; } } - + public static final String module = EntityData.class.getName(); - + protected FlexibleStringExpander locationExdr; protected FlexibleStringExpander delegatorNameExdr; protected FlexibleStringExpander timeoutExdr; @@ -66,7 +66,7 @@ delegatorNameExdr = FlexibleStringExpander.getInstance(element.getAttribute("delegator-name")); timeoutExdr = FlexibleStringExpander.getInstance(element.getAttribute("timeout")); errorListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("error-list-name"), "error_list"); - + mode = element.getAttribute("mode"); if (UtilValidate.isEmpty(mode)) { mode = "load"; @@ -97,7 +97,7 @@ if (dataUrl == null) { messages.add("Could not find Entity Data document in resource: " + location); } - + String timeout = this.timeoutExdr.expandString(methodContext.getEnvMap()); int txTimeout = -1; if (UtilValidate.isNotEmpty(timeout)) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |