svn commit: r737003 [10/11] - in /ofbiz/trunk: ./ applications/accounting/entity
Locked
svn commit: r737003 [10/11] - in /ofbiz/trunk: ./ applications/accounting/entity
 
|
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java Fri Jan 23 03:08:47 2009 @@ -396,7 +396,7 @@ // if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.executeQuery] ps=" + _ps.toString(), module); _rs = _ps.executeQuery(); } catch (SQLException sqle) { - this.checkLockWaitInfo(sqle); + this.checkLockWaitInfo(sqle); throw new GenericDataSourceException("SQL Exception while executing the following:" + _sql, sqle); } @@ -425,10 +425,10 @@ public int executeUpdate() throws GenericDataSourceException { try { // if (Debug.verboseOn()) Debug.logVerbose("[SQLProcessor.executeUpdate] ps=" + _ps.toString(), module); - //TransactionUtil.printAllThreadsTransactionBeginStacks(); + //TransactionUtil.printAllThreadsTransactionBeginStacks(); return _ps.executeUpdate(); } catch (SQLException sqle) { - this.checkLockWaitInfo(sqle); + this.checkLockWaitInfo(sqle); // don't display this here, may not be critical, allow handling further up... Debug.logError(sqle, "SQLProcessor.executeUpdate() : ERROR : ", module); throw new GenericDataSourceException("SQL Exception while executing the following:" + _sql, sqle); } @@ -866,15 +866,15 @@ } private void checkLockWaitInfo(Exception sqle) { - String eMsg = sqle.getMessage(); - - // see if there is a lock wait timeout error, if so try to get and print more info about it - // the string for Derby is "A lock could not be obtained within the time requested" - // the string for MySQL is "Lock wait timeout exceeded; try restarting transaction" - if (eMsg.indexOf("A lock could not be obtained within the time requested") >= 0 || - eMsg.indexOf("Lock wait timeout exceeded") >= 0) { - Debug.logWarning(sqle, "Lock wait timeout error found in thread [" + Thread.currentThread().getId() + "]: (" + eMsg + ") when executing the SQL [" + _sql + "]", module); - TransactionUtil.printAllThreadsTransactionBeginStacks(); - } + String eMsg = sqle.getMessage(); + + // see if there is a lock wait timeout error, if so try to get and print more info about it + // the string for Derby is "A lock could not be obtained within the time requested" + // the string for MySQL is "Lock wait timeout exceeded; try restarting transaction" + if (eMsg.indexOf("A lock could not be obtained within the time requested") >= 0 || + eMsg.indexOf("Lock wait timeout exceeded") >= 0) { + Debug.logWarning(sqle, "Lock wait timeout error found in thread [" + Thread.currentThread().getId() + "]: (" + eMsg + ") when executing the SQL [" + _sql + "]", module); + TransactionUtil.printAllThreadsTransactionBeginStacks(); + } } } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java Fri Jan 23 03:08:47 2009 @@ -559,31 +559,31 @@ } break; case 12: - Object originalObject; - byte[] fieldBytes; - try { - Blob theBlob = rs.getBlob(ind); - fieldBytes = theBlob != null ? theBlob.getBytes(1, (int) theBlob.length()) : null; - originalObject = theBlob; - } catch (SQLException e) { - // for backward compatibility if getBlob didn't work try getBytes + Object originalObject; + byte[] fieldBytes; + try { + Blob theBlob = rs.getBlob(ind); + fieldBytes = theBlob != null ? theBlob.getBytes(1, (int) theBlob.length()) : null; + originalObject = theBlob; + } catch (SQLException e) { + // for backward compatibility if getBlob didn't work try getBytes fieldBytes = rs.getBytes(ind); - originalObject = fieldBytes; - } + originalObject = fieldBytes; + } if (originalObject != null) { - // for backward compatibility, check to see if there is a serialized object and if so return that - Object blobObject = deserializeField(fieldBytes, ind, curField); - if (blobObject != null) { - entity.dangerousSetNoCheckButFast(curField, blobObject); - } else { - if (originalObject instanceof Blob) { - // NOTE using SerialBlob here instead of the Blob from the database to make sure we can pass it around, serialize it, etc - entity.dangerousSetNoCheckButFast(curField, new SerialBlob((Blob) originalObject)); - } else { - entity.dangerousSetNoCheckButFast(curField, originalObject); - } - } + // for backward compatibility, check to see if there is a serialized object and if so return that + Object blobObject = deserializeField(fieldBytes, ind, curField); + if (blobObject != null) { + entity.dangerousSetNoCheckButFast(curField, blobObject); + } else { + if (originalObject instanceof Blob) { + // NOTE using SerialBlob here instead of the Blob from the database to make sure we can pass it around, serialize it, etc + entity.dangerousSetNoCheckButFast(curField, new SerialBlob((Blob) originalObject)); + } else { + entity.dangerousSetNoCheckButFast(curField, originalObject); + } + } } break; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java Fri Jan 23 03:08:47 2009 @@ -556,7 +556,7 @@ // TRANSACTION BEGIN STACK // ======================================= private static void pushTransactionBeginStackSave(Exception e) { - // use the ThreadLocal one because it is more reliable than the all threads Map + // use the ThreadLocal one because it is more reliable than the all threads Map List<Exception> el = transactionBeginStackSave.get(); if (el == null) { el = FastList.newInstance(); @@ -567,20 +567,20 @@ Long curThreadId = Thread.currentThread().getId(); List<Exception> ctEl = allThreadsTransactionBeginStackSave.get(curThreadId); if (ctEl == null) { - ctEl = FastList.newInstance(); - allThreadsTransactionBeginStackSave.put(curThreadId, ctEl); + ctEl = FastList.newInstance(); + allThreadsTransactionBeginStackSave.put(curThreadId, ctEl); } ctEl.add(0, e); } private static Exception popTransactionBeginStackSave() { - // do the unofficial all threads Map one first, and don't do a real return + // do the unofficial all threads Map one first, and don't do a real return Long curThreadId = Thread.currentThread().getId(); List<Exception> ctEl = allThreadsTransactionBeginStackSave.get(curThreadId); if (UtilValidate.isNotEmpty(ctEl)) { ctEl.remove(0); } - - // then do the more reliable ThreadLocal one + + // then do the more reliable ThreadLocal one List<Exception> el = transactionBeginStackSave.get(); if (UtilValidate.isNotEmpty(el)) { return el.remove(0); @@ -593,7 +593,7 @@ if (el != null) { return el.size(); } else { - return 0; + return 0; } } public static List<Exception> getTransactionBeginStackSave() { @@ -603,33 +603,33 @@ return elClone; } public static Map<Long, List<Exception>> getAllThreadsTransactionBeginStackSave() { - Map<Long, List<Exception>> attbssMap = allThreadsTransactionBeginStackSave; - Map<Long, List<Exception>> attbssMapClone = FastMap.newInstance(); - attbssMapClone.putAll(attbssMap); + Map<Long, List<Exception>> attbssMap = allThreadsTransactionBeginStackSave; + Map<Long, List<Exception>> attbssMapClone = FastMap.newInstance(); + attbssMapClone.putAll(attbssMap); return attbssMapClone; } public static void printAllThreadsTransactionBeginStacks() { - if (!Debug.infoOn()) { - return; - } - - for (Map.Entry<Long, Exception> attbsMapEntry : allThreadsTransactionBeginStack.entrySet()) { - Long curThreadId = (Long) attbsMapEntry.getKey(); - Exception transactionBeginStack = attbsMapEntry.getValue(); - List<Exception> txBeginStackList = allThreadsTransactionBeginStackSave.get(curThreadId); - - Debug.logInfo(transactionBeginStack, "===================================================\n===================================================\n Current tx begin stack for thread [" + curThreadId + "]:", module); - - if (UtilValidate.isNotEmpty(txBeginStackList)) { - int stackLevel = 0; - for (Exception stack : txBeginStackList) { - Debug.logInfo(stack, "===================================================\n===================================================\n Tx begin stack history for thread [" + curThreadId + "] history number [" + stackLevel + "]:", module); - stackLevel++; - } - } else { - Debug.logInfo("========================================== No tx begin stack history found for thread [" + curThreadId + "]", module); - } - } + if (!Debug.infoOn()) { + return; + } + + for (Map.Entry<Long, Exception> attbsMapEntry : allThreadsTransactionBeginStack.entrySet()) { + Long curThreadId = (Long) attbsMapEntry.getKey(); + Exception transactionBeginStack = attbsMapEntry.getValue(); + List<Exception> txBeginStackList = allThreadsTransactionBeginStackSave.get(curThreadId); + + Debug.logInfo(transactionBeginStack, "===================================================\n===================================================\n Current tx begin stack for thread [" + curThreadId + "]:", module); + + if (UtilValidate.isNotEmpty(txBeginStackList)) { + int stackLevel = 0; + for (Exception stack : txBeginStackList) { + Debug.logInfo(stack, "===================================================\n===================================================\n Tx begin stack history for thread [" + curThreadId + "] history number [" + stackLevel + "]:", module); + stackLevel++; + } + } else { + Debug.logInfo("========================================== No tx begin stack history found for thread [" + curThreadId + "]", module); + } + } } private static void setTransactionBeginStack() { Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java Fri Jan 23 03:08:47 2009 @@ -399,7 +399,7 @@ public static List<GenericValue> findDatedInclusionEntity(GenericDelegator delegator, String entityName, Map<String, ? extends Object> search, Timestamp now) throws GenericEntityException { EntityCondition searchCondition = EntityCondition.makeCondition(UtilMisc.toList( - EntityCondition.makeCondition(search), EntityUtil.getFilterByDateExpr(now))); + EntityCondition.makeCondition(search), EntityUtil.getFilterByDateExpr(now))); return delegator.findList(entityName, searchCondition, null, UtilMisc.toList("-fromDate"), null, false); } Modified: ofbiz/trunk/framework/entityext/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/entitydef/entitymodel.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entityext/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/framework/entityext/entitydef/entitymodel.xml Fri Jan 23 03:08:47 2009 @@ -153,8 +153,8 @@ </relation> </entity> <view-entity entity-name="EntitySyncInclGrpDetailView" - package-name="org.ofbiz.entity.synchronization" - title="Entity Synchronization Include Entity Group Detail View Entity"> + package-name="org.ofbiz.entity.synchronization" + title="Entity Synchronization Include Entity Group Detail View Entity"> <member-entity entity-alias="ESIG" entity-name="EntitySyncIncludeGroup"/> <member-entity entity-alias="EGE" entity-name="EntityGroupEntry"/> <alias-all entity-alias="ESIG"/> Modified: ofbiz/trunk/framework/entityext/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/servicedef/services.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/entityext/servicedef/services.xml (original) +++ ofbiz/trunk/framework/entityext/servicedef/services.xml Fri Jan 23 03:08:47 2009 @@ -239,7 +239,7 @@ <attribute name="entitySyncId" type="String" mode="IN" optional="false"/> </service> <service name="storeEntitySyncData" engine="java" location="org.ofbiz.entityext.synchronization.EntitySyncServices" invoke="storeEntitySyncData" - export="true" auth="true" require-new-transaction="true" transaction-timeout="900"> + export="true" auth="true" require-new-transaction="true" transaction-timeout="900"> <description>Run Entity Sync</description> <attribute name="entitySyncId" type="String" mode="IN" optional="false"/> <attribute name="valuesToCreate" type="List" mode="IN" optional="false"/> Modified: ofbiz/trunk/framework/example/src/org/ofbiz/example/ExamplePrintServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/src/org/ofbiz/example/ExamplePrintServices.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/example/src/org/ofbiz/example/ExamplePrintServices.java (original) +++ ofbiz/trunk/framework/example/src/org/ofbiz/example/ExamplePrintServices.java Fri Jan 23 03:08:47 2009 @@ -131,9 +131,9 @@ PrintService[] services = PrintServiceLookup.lookupPrintServices(docFlavor, aset); if (services.length > 0) { - DocPrintJob job = services[0].createPrintJob(); + DocPrintJob job = services[0].createPrintJob(); try { - job.print(myDoc, aset); + job.print(myDoc, aset); } catch (PrintException pe) { String errMsg = "Unable to print PDF from XSL-FO: " + pe.toString(); Debug.logError(pe, errMsg, module); Modified: ofbiz/trunk/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy (original) +++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/actions/includes/FindExampleFeatures.groovy Fri Jan 23 03:08:47 2009 @@ -39,6 +39,6 @@ entityConditionList = EntityCondition.makeCondition(andExprs, EntityOperator.AND); autocompleteOptions = delegator.findList("ExampleFeature", entityConditionList, ['exampleFeatureId', 'description'] as Set, ['-exampleFeatureId'], null, false); //context.autocompleteOptions = autocompleteOptions; - request.setAttribute("autocompleteOptions", autocompleteOptions); + request.setAttribute("autocompleteOptions", autocompleteOptions); } return "success"; \ No newline at end of file Modified: ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml (original) +++ ofbiz/trunk/framework/example/widget/example/ExampleFeatureScreens.xml Fri Jan 23 03:08:47 2009 @@ -102,7 +102,7 @@ </condition> <actions> <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupExampleFeature}"/> + <set field="title" value="${uiLabelMap.PageTitleLookupExampleFeature}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/> 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=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java Fri Jan 23 03:08:47 2009 @@ -120,7 +120,7 @@ public void compileExpr (String source, int lineNo, int columnNo, Object expr, CodeBuffer cb) throws BSFException; - public void compileScript (String source, int lineNo, int columnNo, + public void compileScript (String source, int lineNo, int columnNo, Object script, CodeBuffer cb) throws BSFException; */ 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=737003&r1=737002&r2=737003&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 Fri Jan 23 03:08:47 2009 @@ -55,7 +55,7 @@ for (Element orderByElement: UtilXml.childElementList(element, "order-by")) { FlexibleMapAccessor<String> fma = FlexibleMapAccessor.getInstance(UtilValidate.isNotEmpty(orderByElement.getAttribute("field")) ? - orderByElement.getAttribute("field") : orderByElement.getAttribute("field-name")); + orderByElement.getAttribute("field") : orderByElement.getAttribute("field-name")); this.orderByAcsrList.add(fma); } 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=737003&r1=737002&r2=737003&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 Fri Jan 23 03:08:47 2009 @@ -42,20 +42,20 @@ public static final String module = RequestParametersToList.class.getName(); - ContextAccessor<List<String>> listAcsr; - String requestName; + ContextAccessor<List<String>> listAcsr; + String requestName; public RequestParametersToList(Element element, SimpleMethod simpleMethod) { super(element, simpleMethod); requestName = element.getAttribute("request-name"); - listAcsr = new ContextAccessor<List<String>>(element.getAttribute("list-name"), requestName); + listAcsr = new ContextAccessor<List<String>>(element.getAttribute("list-name"), requestName); } public boolean exec(MethodContext methodContext) { List<String> listVal = null; // only run this if it is in an EVENT context if (methodContext.getMethodType() == MethodContext.EVENT) { - String[] parameterValues = methodContext.getRequest().getParameterValues(requestName); + String[] parameterValues = methodContext.getRequest().getParameterValues(requestName); if (parameterValues == null) { Debug.logWarning("Request parameter values not found with name " + requestName, module); } else { @@ -65,18 +65,18 @@ // if listVal is null, use a empty list; if (listVal == null) { - listVal = FastList.newInstance(); + listVal = FastList.newInstance(); } - List<String> toList = listAcsr.get(methodContext); + List<String> toList = listAcsr.get(methodContext); - if (toList == null) { - if (Debug.verboseOn()) Debug.logVerbose("List not found with name " + listAcsr + ", creating new list", module); - toList = FastList.newInstance(); - listAcsr.put(methodContext, toList); - } + if (toList == null) { + if (Debug.verboseOn()) Debug.logVerbose("List not found with name " + listAcsr + ", creating new list", module); + toList = FastList.newInstance(); + listAcsr.put(methodContext, toList); + } - toList.addAll(listVal); + toList.addAll(listVal); return true; } Modified: ofbiz/trunk/framework/security/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/entitydef/entitymodel.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/security/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/framework/security/entitydef/entitymodel.xml Fri Jan 23 03:08:47 2009 @@ -129,7 +129,7 @@ <entity entity-name="SecurityGroup" package-name="org.ofbiz.security.securitygroup" - default-resource-name="SecurityEntityLabels" + default-resource-name="SecurityEntityLabels" title="Security Component - Security Group Entity"> <field name="groupId" type="id-ne"></field> <field name="description" type="description"></field> Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java (original) +++ ofbiz/trunk/framework/security/src/org/ofbiz/security/Security.java Fri Jan 23 03:08:47 2009 @@ -59,7 +59,7 @@ * * @param userLoginId The userLoginId to find security groups by * @return An iterator made from the Collection either cached or retrieved from the database through the - * UserLoginSecurityGroup Delegator. + * UserLoginSecurityGroup Delegator. */ public abstract Iterator<GenericValue> findUserLoginSecurityGroupByUserLoginId(String userLoginId); Modified: ofbiz/trunk/framework/service/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/servicedef/services.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/servicedef/services.xml (original) +++ ofbiz/trunk/framework/service/servicedef/services.xml Fri Jan 23 03:08:47 2009 @@ -20,19 +20,19 @@ <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> - <description>OFBiz Service Engine Services</description> - <vendor>OFBiz</vendor> - <version>1.0</version> + <description>OFBiz Service Engine Services</description> + <vendor>OFBiz</vendor> + <version>1.0</version> <!-- Service Engine Services --> - <service name="purgeOldJobs" engine="java" + <service name="purgeOldJobs" engine="java" location="org.ofbiz.service.ServiceUtil" invoke="purgeOldJobs" auth="true" use-transaction="false" semaphore="wait"> - <description>Cleans out old jobs which have been around longer then what is defined in serviceengine.xml</description> + <description>Cleans out old jobs which have been around longer then what is defined in serviceengine.xml</description> <required-permissions join-type="AND"> <check-permission permission="SERVICE_INVOKE_ANY"/> </required-permissions> <!-- this service has no attributes --> - </service> + </service> <service name="cancelScheduledJob" engine="java" location="org.ofbiz.service.ServiceUtil" invoke="cancelJob" auth="true"> Modified: ofbiz/trunk/framework/service/servicedef/services_test_se.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/servicedef/services_test_se.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/servicedef/services_test_se.xml (original) +++ ofbiz/trunk/framework/service/servicedef/services_test_se.xml Fri Jan 23 03:08:47 2009 @@ -20,9 +20,9 @@ <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> - <description>OFBiz Service Engine Services</description> - <vendor>OFBiz</vendor> - <version>1.0</version> + <description>OFBiz Service Engine Services</description> + <vendor>OFBiz</vendor> + <version>1.0</version> <!-- dead lock retry testing services --> <service name="testServiceDeadLockRetry" engine="java" auth="false" Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Fri Jan 23 03:08:47 2009 @@ -1024,7 +1024,7 @@ public List<ModelParam> getModelParamList() { List<ModelParam> newList = FastList.newInstance(); newList.addAll(this.contextParamList); - return newList; + return newList; } /** @@ -1074,8 +1074,8 @@ ModelParam existingParam = this.contextInfo.get(newParam.name); if (existingParam != null) { // if the existing param is not INOUT and the newParam.mode is different from existingParam.mode, make the existing param optional and INOUT - // TODO: this is another case where having different optional/required settings for IN and OUT would be quite valuable... - if (!"INOUT".equals(existingParam.mode) && !existingParam.mode.equals(newParam.mode)) { + // TODO: this is another case where having different optional/required settings for IN and OUT would be quite valuable... + if (!"INOUT".equals(existingParam.mode) && !existingParam.mode.equals(newParam.mode)) { existingParam.mode = "INOUT"; if (existingParam.optional || newParam.optional) { existingParam.optional = true; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java Fri Jan 23 03:08:47 2009 @@ -235,7 +235,7 @@ /** Checks the current recurrence validity at the moment. */ public boolean isValidCurrent() { - return isValidCurrent(RecurrenceUtil.now()); + return isValidCurrent(RecurrenceUtil.now()); } /** Checks the current recurrence validity for checkTime. */ Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java Fri Jan 23 03:08:47 2009 @@ -324,71 +324,71 @@ if (cal.get(Calendar.YEAR) != checkTimeCal.get(Calendar.YEAR)) { return 0; } - + case MONTHLY: - if (MONTHLY == getFrequency()) { + if (MONTHLY == getFrequency()) { cal.add(Calendar.MONTH, -getIntervalInt()); if (cal.get(Calendar.MONTH) != checkTimeCal.get(Calendar.MONTH)) { return 0; } - } else { + } else { cal.set(Calendar.MONTH, checkTimeCal.get(Calendar.MONTH)); } - + case WEEKLY: - if (WEEKLY == getFrequency()) { + if (WEEKLY == getFrequency()) { cal.add(Calendar.WEEK_OF_YEAR, -getIntervalInt()); if (cal.get(Calendar.WEEK_OF_YEAR) != checkTimeCal.get(Calendar.WEEK_OF_YEAR)) { return 0; } - } else { + } else { cal.set(Calendar.WEEK_OF_YEAR, checkTimeCal.get(Calendar.WEEK_OF_YEAR)); } case DAILY: - if (DAILY == getFrequency()) { + if (DAILY == getFrequency()) { cal.add(Calendar.DAY_OF_MONTH, -getIntervalInt()); if (cal.get(Calendar.DAY_OF_MONTH) != checkTimeCal.get(Calendar.DAY_OF_MONTH)) { return 0; } - } else { + } else { cal.set(Calendar.DAY_OF_MONTH, checkTimeCal.get(Calendar.DAY_OF_MONTH)); } case HOURLY: - if (HOURLY == getFrequency()) { + if (HOURLY == getFrequency()) { cal.add(Calendar.HOUR_OF_DAY, -getIntervalInt()); if (cal.get(Calendar.HOUR_OF_DAY) != checkTimeCal.get(Calendar.HOUR_OF_DAY)) { return 0; } - } else { + } else { cal.set(Calendar.HOUR_OF_DAY, checkTimeCal.get(Calendar.HOUR_OF_DAY)); } case MINUTELY: - if (MINUTELY == getFrequency()) { + if (MINUTELY == getFrequency()) { cal.add(Calendar.MINUTE, -getIntervalInt()); if (cal.get(Calendar.MINUTE) != checkTimeCal.get(Calendar.MINUTE)) { return 0; } - } else { + } else { cal.set(Calendar.MINUTE, checkTimeCal.get(Calendar.MINUTE)); } case SECONDLY: - if (SECONDLY == getFrequency()) { + if (SECONDLY == getFrequency()) { cal.add(Calendar.SECOND, -getIntervalInt()); if (cal.get(Calendar.SECOND) != checkTimeCal.get(Calendar.SECOND)) { return 0; } - } else { + } else { cal.set(Calendar.SECOND, checkTimeCal.get(Calendar.SECOND)); } } // Check for validity of the current frequency. if (validByRule(cal.getTime())) { - return cal.getTime().getTime(); + return cal.getTime().getTime(); } return 0; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Fri Jan 23 03:08:47 2009 @@ -156,11 +156,11 @@ // use the result to update the result fields if (resultToResult) { - Map<String, Object> normalizedActionResult = dctx.getModelService(selfService).makeValid(actionResult, ModelService.OUT_PARAM, false, null); - // don't copy over the error messages, use the combining code to do that later - normalizedActionResult.remove(ModelService.ERROR_MESSAGE); - normalizedActionResult.remove(ModelService.ERROR_MESSAGE_LIST); - normalizedActionResult.remove(ModelService.ERROR_MESSAGE_MAP); + Map<String, Object> normalizedActionResult = dctx.getModelService(selfService).makeValid(actionResult, ModelService.OUT_PARAM, false, null); + // don't copy over the error messages, use the combining code to do that later + normalizedActionResult.remove(ModelService.ERROR_MESSAGE); + normalizedActionResult.remove(ModelService.ERROR_MESSAGE_LIST); + normalizedActionResult.remove(ModelService.ERROR_MESSAGE_MAP); normalizedActionResult.remove("failMessage"); result.putAll(normalizedActionResult); } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java Fri Jan 23 03:08:47 2009 @@ -212,11 +212,11 @@ newEntity.setPKFields(parameters, true); } else { throw new GenericServiceException("In Service [" + modelService.name + "] which uses the entity-auto engine with the create invoke option: " + - "could not find a valid combination of primary key settings to do a known create operation; options include: " + - "1. a single OUT pk for primary auto-sequencing, " + - "2. a single INOUT pk for primary auto-sequencing with optional override, " + - "3. a 2-part pk with one part IN (existing primary pk) and one part OUT (the secdonary pk to sub-sequence, " + - "4. all pk fields are IN for a manually specified primary key"); + "could not find a valid combination of primary key settings to do a known create operation; options include: " + + "1. a single OUT pk for primary auto-sequencing, " + + "2. a single INOUT pk for primary auto-sequencing with optional override, " + + "3. a 2-part pk with one part IN (existing primary pk) and one part OUT (the secdonary pk to sub-sequence, " + + "4. all pk fields are IN for a manually specified primary key"); } // handle the case where there is a fromDate in the pk of the entity, and it is optional or undefined in the service def, populate automatically Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java Fri Jan 23 03:08:47 2009 @@ -81,13 +81,13 @@ numDefs++; } if (Debug.importantOn()) { - String resourceLocation = handler.getLocation(); - try { - resourceLocation = handler.getURL().toExternalForm(); - } catch (GenericConfigException e) { - Debug.logError(e, "Could not get resource URL", module); - } - Debug.logImportant("Loaded " + numDefs + " Group definitions from " + resourceLocation, module); + String resourceLocation = handler.getLocation(); + try { + resourceLocation = handler.getURL().toExternalForm(); + } catch (GenericConfigException e) { + Debug.logError(e, "Could not get resource URL", module); + } + Debug.logImportant("Loaded " + numDefs + " Group definitions from " + resourceLocation, module); } } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobInvoker.java Fri Jan 23 03:08:47 2009 @@ -145,11 +145,11 @@ } public Long getThreadId() { - if (this.thread != null) { - return this.thread.getId(); - } else { - return null; - } + if (this.thread != null) { + return this.thread.getId(); + } else { + return null; + } } /** Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java Fri Jan 23 03:08:47 2009 @@ -131,8 +131,8 @@ boolean pollDone = false; while (!pollDone) { - // an extra protection for synchronization, help make sure we don't get in here more than once - synchronized (this) { + // an extra protection for synchronization, help make sure we don't get in here more than once + synchronized (this) { boolean beganTransaction = false; try { @@ -192,7 +192,7 @@ Debug.logError(e, errMsg, module); } } - } + } } return poll; } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobPoller.java Fri Jan 23 03:08:47 2009 @@ -171,13 +171,13 @@ */ public Job next() { if (run.size() > 0) { - // NOTE: this syncrhonized isn't really necessary as the only method that calls it is already synchronized (the JobInvoker.run method), so this is here as an added protection especially for the case where it might be used differently in the future - synchronized (run) { - // make sure the size is still greater than zero + // NOTE: this syncrhonized isn't really necessary as the only method that calls it is already synchronized (the JobInvoker.run method), so this is here as an added protection especially for the case where it might be used differently in the future + synchronized (run) { + // make sure the size is still greater than zero if (run.size() > 0) { - return run.remove(0); + return run.remove(0); } - } + } } return null; } @@ -186,25 +186,25 @@ * Adds a job to the RUN queue */ public void queueNow(Job job) { - //Debug.logInfo("[" + Thread.currentThread().getId() + "] Begin queueNow; holds run lock? " + Thread.holdsLock(run), module); - - // NOTE DEJ20071201 MUST use a different object for the lock here because the "this" object is always held by the poller thread in the run method above (which sleeps and runs) - synchronized (run) { + //Debug.logInfo("[" + Thread.currentThread().getId() + "] Begin queueNow; holds run lock? " + Thread.holdsLock(run), module); + + // NOTE DEJ20071201 MUST use a different object for the lock here because the "this" object is always held by the poller thread in the run method above (which sleeps and runs) + synchronized (run) { run.add(job); - } + } if (Debug.verboseOn()) Debug.logVerbose("New run queue size: " + run.size(), module); if (run.size() > pool.size() && pool.size() < maxThreads()) { - synchronized (pool) { - if (run.size() > pool.size() && pool.size() < maxThreads()) { - int calcSize = (run.size() / jobsPerThread()) - (pool.size()); - int addSize = calcSize > maxThreads() ? maxThreads() : calcSize; - - for (int i = 0; i < addSize; i++) { - JobInvoker iv = new JobInvoker(this, invokerWaitTime()); - pool.add(iv); - } - } - } + synchronized (pool) { + if (run.size() > pool.size() && pool.size() < maxThreads()) { + int calcSize = (run.size() / jobsPerThread()) - (pool.size()); + int addSize = calcSize > maxThreads() ? maxThreads() : calcSize; + + for (int i = 0; i < addSize; i++) { + JobInvoker iv = new JobInvoker(this, invokerWaitTime()); + pool.add(iv); + } + } + } } } Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java Fri Jan 23 03:08:47 2009 @@ -301,21 +301,21 @@ // process each message for (Message message: messages) { // process each un-read message - if (!message.isSet(Flags.Flag.SEEN)) { - long messageSize = message.getSize(); - if (message instanceof MimeMessage && messageSize >= maxSize) { - Debug.logWarning("Message from: " + message.getFrom()[0] + "not received, too big, size:" + messageSize + " cannot be more than " + maxSize + " bytes", module); - } else { - this.processMessage(message, session); - if (Debug.verboseOn()) Debug.logVerbose("Message from " + UtilMisc.toListArray(message.getFrom()) + " with subject [" + message.getSubject() + "] has been processed." , module); - message.setFlag(Flags.Flag.SEEN, true); - if (Debug.verboseOn()) Debug.logVerbose("Message [" + message.getSubject() + "] is marked seen", module); - } - } - if (deleteMail) { - if (Debug.verboseOn()) Debug.logVerbose("Message [" + message.getSubject() + "] is being deleted", module); - message.setFlag(Flags.Flag.DELETED, true); - } + if (!message.isSet(Flags.Flag.SEEN)) { + long messageSize = message.getSize(); + if (message instanceof MimeMessage && messageSize >= maxSize) { + Debug.logWarning("Message from: " + message.getFrom()[0] + "not received, too big, size:" + messageSize + " cannot be more than " + maxSize + " bytes", module); + } else { + this.processMessage(message, session); + if (Debug.verboseOn()) Debug.logVerbose("Message from " + UtilMisc.toListArray(message.getFrom()) + " with subject [" + message.getSubject() + "] has been processed." , module); + message.setFlag(Flags.Flag.SEEN, true); + if (Debug.verboseOn()) Debug.logVerbose("Message [" + message.getSubject() + "] is marked seen", module); + } + } + if (deleteMail) { + if (Debug.verboseOn()) Debug.logVerbose("Message [" + message.getSubject() + "] is being deleted", module); + message.setFlag(Flags.Flag.DELETED, true); + } } // expunge and close the folder Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java Fri Jan 23 03:08:47 2009 @@ -94,9 +94,9 @@ } public static List<ServiceMcaRule> getServiceMcaRules() { - if (mcaCache.size() == 0) { - readConfig(); - } + if (mcaCache.size() == 0) { + readConfig(); + } return mcaCache.values(); } Modified: ofbiz/trunk/framework/start/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/build.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/start/build.xml (original) +++ ofbiz/trunk/framework/start/build.xml Fri Jan 23 03:08:47 2009 @@ -33,7 +33,7 @@ <target name="classes" depends="prepare"> <!-- compile start --> - <javac15 destdir="${build.dir}/classes" srcdir="${src.dir}"/> + <javac15 destdir="${build.dir}/classes" srcdir="${src.dir}"/> </target> <target name="jar" depends="classes"> Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Fri Jan 23 03:08:47 2009 @@ -91,7 +91,7 @@ public static String makeLoginUrl(ServletRequest request) { return makeLoginUrl(request, "checkLogin"); } - + public static String makeLoginUrl(PageContext pageContext, String requestName) { return makeLoginUrl(pageContext.getRequest(), requestName); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java Fri Jan 23 03:08:47 2009 @@ -116,12 +116,12 @@ } protected void setResponseHeader(ServerStreamConnection con, String header, String value) { - ((HttpStreamConnection) con).getResponse().setHeader(header, value); - } + ((HttpStreamConnection) con).getResponse().setHeader(header, value); + } protected XmlRpcHttpRequestConfig getXmlRpcConfig(HttpServletRequest req) { - XmlRpcHttpRequestConfigImpl result = new XmlRpcHttpRequestConfigImpl(); - XmlRpcHttpServerConfig serverConfig = (XmlRpcHttpServerConfig) getConfig(); + XmlRpcHttpRequestConfigImpl result = new XmlRpcHttpRequestConfigImpl(); + XmlRpcHttpServerConfig serverConfig = (XmlRpcHttpServerConfig) getConfig(); result.setBasicEncoding(serverConfig.getBasicEncoding()); result.setContentLengthOptional(serverConfig.isContentLengthOptional()); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishViewHandler.java Fri Jan 23 03:08:47 2009 @@ -60,17 +60,17 @@ public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { Writer writer = null; try { - // use UtilJ2eeCompat to get this setup properly - boolean useOutputStreamNotWriter = false; - if (this.servletContext != null) { - useOutputStreamNotWriter = UtilJ2eeCompat.useOutputStreamNotWriter(this.servletContext); - } - if (useOutputStreamNotWriter) { - ServletOutputStream ros = response.getOutputStream(); + // use UtilJ2eeCompat to get this setup properly + boolean useOutputStreamNotWriter = false; + if (this.servletContext != null) { + useOutputStreamNotWriter = UtilJ2eeCompat.useOutputStreamNotWriter(this.servletContext); + } + if (useOutputStreamNotWriter) { + ServletOutputStream ros = response.getOutputStream(); writer = new OutputStreamWriter(ros, "UTF-8"); - } else { + } else { writer = response.getWriter(); - } + } wrapper.render(page, request, response, writer, null, true); } catch (IOException e) { throw new ViewHandlerException("Problems with the response writer/output stream", e); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ViewFactory.java Fri Jan 23 03:08:47 2009 @@ -122,7 +122,7 @@ handler.init(context); } catch (ClassNotFoundException cnf) { //throw new ViewHandlerException("Cannot load handler class", cnf); - Debug.logWarning("Warning: could not load view handler class because it was not found; note that some views may not work: " + cnf.toString(), module); + Debug.logWarning("Warning: could not load view handler class because it was not found; note that some views may not work: " + cnf.toString(), module); } catch (InstantiationException ie) { throw new ViewHandlerException("Cannot get instance of the handler", ie); } catch (IllegalAccessException iae) { Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java Fri Jan 23 03:08:47 2009 @@ -81,7 +81,7 @@ } private static void prepareAll() throws GeneralException { - labels = new TreeMap<String, LabelInfo>(); + labels = new TreeMap<String, LabelInfo>(); fileNamesFound = new TreeMap<String, String>(); fileComponent = new TreeMap<String, String>(); localesFound = new TreeSet<String>(); @@ -89,9 +89,9 @@ int duplicatedLocales = 0; try { - Collection<ComponentConfig> componentConfigs = ComponentConfig.getAllComponents(); - - for (ComponentConfig componentConfig: componentConfigs) { + Collection<ComponentConfig> componentConfigs = ComponentConfig.getAllComponents(); + + for (ComponentConfig componentConfig: componentConfigs) { String componentName = componentConfig.getComponentName(); List<File> resourceFiles = FileUtil.findXmlFiles(componentConfig.getRootLocation(), null, "resource", null); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/UomReport.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/UomReport.xml?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/UomReport.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/UomReport.xml Fri Jan 23 03:08:47 2009 @@ -25,11 +25,11 @@ <paper name="US-Letter" /> <database driverClassName="org.postgresql.Driver" - connInfo="jdbc:postgresql://127.0.0.1/ofbiz" - name="ofbiz" username="ofbiz" /> + connInfo="jdbc:postgresql://127.0.0.1/ofbiz" + name="ofbiz" username="ofbiz" /> <query> - <join from="UOM.UOM_TYPE_ID" relation="=" to="UOM_TYPE.UOM_TYPE_ID"/> + <join from="UOM.UOM_TYPE_ID" relation="=" to="UOM_TYPE.UOM_TYPE_ID"/> </query> <parameters> @@ -39,99 +39,99 @@ </formulas> <headers> - <section height="20.0"> - </section> + <section height="20.0"> + </section> </headers> <footers> - <section height="20.0"> - </section> + <section height="20.0"> + </section> </footers> <page> - <headers> - <section height="18.0"> - <field id="2" type="text"> - <text><![CDATA[Abbreviation]]></text> - <bounds x="69.0" y="1.0" width="78.0" height="16.0" /> - <format size="11.0" bold="true" underline="true" /> - </field> - <field id="4" type="text"> - <text><![CDATA[Description]]></text> - <bounds x="150.0" y="1.0" width="120.0" height="16.0" /> - <format size="11.0" bold="true" underline="true" /> - </field> - <field id="6" type="text"> - <text><![CDATA[Uom_id]]></text> - <bounds x="7.0" y="0.0" width="61.0" height="16.0" /> - <format size="11.0" bold="true" underline="true" /> - </field> - </section> - </headers> - <footers> - <section height="20.0"> - </section> - </footers> + <headers> + <section height="18.0"> + <field id="2" type="text"> + <text><![CDATA[Abbreviation]]></text> + <bounds x="69.0" y="1.0" width="78.0" height="16.0" /> + <format size="11.0" bold="true" underline="true" /> + </field> + <field id="4" type="text"> + <text><![CDATA[Description]]></text> + <bounds x="150.0" y="1.0" width="120.0" height="16.0" /> + <format size="11.0" bold="true" underline="true" /> + </field> + <field id="6" type="text"> + <text><![CDATA[Uom_id]]></text> + <bounds x="7.0" y="0.0" width="61.0" height="16.0" /> + <format size="11.0" bold="true" underline="true" /> + </field> + </section> + </headers> + <footers> + <section height="20.0"> + </section> + </footers> </page> <groups> - <group column="UOM_TYPE.UOM_TYPE_ID"> - <headers> - <section height="18.0"> - <field id="11" type="column" value="UOM_TYPE.UOM_TYPE_ID"> - <bounds x="68.0" y="0.0" width="176.0" height="18.0" /> - <format size="11.0" bold="true" /> - </field> - <field id="12" type="text"> - <text><![CDATA[UOM Type:]]></text> - <bounds x="7.0" y="0.0" width="120.0" height="18.0" /> - </field> - <field id="9" type="column" value="UOM_TYPE.DESCRIPTION"> - <bounds x="245.0" y="0.0" width="358.0" height="18.0" /> - </field> - </section> - </headers> - <footers> - <section height="5.0"> - </section> - </footers> - </group> + <group column="UOM_TYPE.UOM_TYPE_ID"> + <headers> + <section height="18.0"> + <field id="11" type="column" value="UOM_TYPE.UOM_TYPE_ID"> + <bounds x="68.0" y="0.0" width="176.0" height="18.0" /> + <format size="11.0" bold="true" /> + </field> + <field id="12" type="text"> + <text><![CDATA[UOM Type:]]></text> + <bounds x="7.0" y="0.0" width="120.0" height="18.0" /> + </field> + <field id="9" type="column" value="UOM_TYPE.DESCRIPTION"> + <bounds x="245.0" y="0.0" width="358.0" height="18.0" /> + </field> + </section> + </headers> + <footers> + <section height="5.0"> + </section> + </footers> + </group> </groups> <details> - <section height="15.0"> - <field id="1" type="column" value="UOM.ABBREVIATION"> - <bounds x="69.0" y="0.0" width="80.0" height="15.0" /> - <format size="9.0" format="" /> - <border> - <edge location="top" number="0" thickness="1.0" style="line" /> - <edge location="bottom" number="0" thickness="1.0" style="line" /> - <edge location="left" number="0" thickness="1.0" style="line" /> - <edge location="right" number="0" thickness="1.0" style="line" /> - </border> - </field> - <field id="3" type="column" value="UOM.DESCRIPTION"> - <bounds x="151.0" y="0.0" width="355.0" height="15.0" /> - <format size="9.0" bold="true" format="" /> - <border> - <edge location="top" number="0" thickness="1.0" style="line" /> - <edge location="bottom" number="0" thickness="1.0" style="line" /> - <edge location="left" number="0" thickness="1.0" style="line" /> - <edge location="right" number="0" thickness="1.0" style="line" /> - </border> - </field> - <field id="5" type="column" value="UOM.UOM_ID"> - <bounds x="6.0" y="0.0" width="63.0" height="15.0" /> - <format size="9.0" bold="true" format="" /> - <border> - <edge location="top" number="0" thickness="1.0" style="line" /> - <edge location="bottom" number="0" thickness="1.0" style="line" /> - <edge location="left" number="0" thickness="1.0" style="line" /> - <edge location="right" number="0" thickness="1.0" style="line" /> - </border> - </field> - </section> + <section height="15.0"> + <field id="1" type="column" value="UOM.ABBREVIATION"> + <bounds x="69.0" y="0.0" width="80.0" height="15.0" /> + <format size="9.0" format="" /> + <border> + <edge location="top" number="0" thickness="1.0" style="line" /> + <edge location="bottom" number="0" thickness="1.0" style="line" /> + <edge location="left" number="0" thickness="1.0" style="line" /> + <edge location="right" number="0" thickness="1.0" style="line" /> + </border> + </field> + <field id="3" type="column" value="UOM.DESCRIPTION"> + <bounds x="151.0" y="0.0" width="355.0" height="15.0" /> + <format size="9.0" bold="true" format="" /> + <border> + <edge location="top" number="0" thickness="1.0" style="line" /> + <edge location="bottom" number="0" thickness="1.0" style="line" /> + <edge location="left" number="0" thickness="1.0" style="line" /> + <edge location="right" number="0" thickness="1.0" style="line" /> + </border> + </field> + <field id="5" type="column" value="UOM.UOM_ID"> + <bounds x="6.0" y="0.0" width="63.0" height="15.0" /> + <format size="9.0" bold="true" format="" /> + <border> + <edge location="top" number="0" thickness="1.0" style="line" /> + <edge location="bottom" number="0" thickness="1.0" style="line" /> + <edge location="left" number="0" thickness="1.0" style="line" /> + <edge location="right" number="0" thickness="1.0" style="line" /> + </border> + </field> + </section> </details> </report> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy Fri Jan 23 03:08:47 2009 @@ -41,7 +41,7 @@ entity = reader.getModelEntity(entityName); if (filterByGroupName && !filterByGroupName.equals(delegator.getEntityGroupName(entity.getEntityName()))) { - return; + return; } viewEntity = "N"; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy Fri Jan 23 03:08:47 2009 @@ -98,7 +98,7 @@ perfRow.callsPerSecond = decimalFormat.format(callsPerSecond); performanceList.add(perfRow); - createTestList = []; + createTestList = []; calls = 1000; startTime = System.currentTimeMillis(); for (int i = 0; i < calls; i++) { Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy Fri Jan 23 03:08:47 2009 @@ -446,13 +446,13 @@ showWsdl = parameters.show_wsdl; if(showWsdl?.equals("true")) { - try { - wsdl = curServiceModel.toWSDL("http://${request.getServerName()}:${UtilProperties.getPropertyValue("url.properties", "port.http", "80")}${parameters._CONTROL_PATH_}/SOAPService"); - curServiceMap.wsdl = UtilXml.writeXmlDocument(wsdl); - } catch (WSDLException ex) { - curServiceMap.wsdl = ex.getLocalizedMessage(); - } - context.showWsdl = true; + try { + wsdl = curServiceModel.toWSDL("http://${request.getServerName()}:${UtilProperties.getPropertyValue("url.properties", "port.http", "80")}${parameters._CONTROL_PATH_}/SOAPService"); + curServiceMap.wsdl = UtilXml.writeXmlDocument(wsdl); + } catch (WSDLException ex) { + curServiceMap.wsdl = ex.getLocalizedMessage(); + } + context.showWsdl = true; } context.selectedServiceMap = curServiceMap; } Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/ReadXpdl.groovy Fri Jan 23 03:08:47 2009 @@ -57,7 +57,7 @@ messages.add(e.toString()); Debug.log(e); } - + if (toBeStored && xpdlImport) { beganTransaction = false; try { Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy Fri Jan 23 03:08:47 2009 @@ -29,7 +29,7 @@ workflow = parameters.workflow; workflowDef = null; -if (!workflow) { +if (!workflow) { runningProcesses = delegator.findByAnd("WorkEffort", [workEffortTypeId : "WORK_FLOW", currentStatusId : "WF_RUNNING"]); if (runningProcesses) { context.runningProcesses = runningProcesses; Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Fri Jan 23 03:08:47 2009 @@ -348,12 +348,12 @@ context.put("queryString", queryString); context.put("queryStringMap", result.get("queryStringMap")); if (UtilValidate.isNotEmpty(queryString)){ - try { - String queryStringEncoded = queryString.replaceAll("&", "%26"); + try { + String queryStringEncoded = queryString.replaceAll("&", "%26"); context.put("queryStringEncoded", queryStringEncoded); - } catch (PatternSyntaxException e) { - - } + } catch (PatternSyntaxException e) { + + } } } else { context.putAll(result); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Fri Jan 23 03:08:47 2009 @@ -425,18 +425,18 @@ } ModelReader entityModelReader = this.getModelForm().entityModelReader; try { - ModelEntity modelEntity = entityModelReader.getModelEntity(this.getEntityName()); - if (modelEntity != null) { - ModelField modelField = modelEntity.getField(this.getFieldName()); - if (modelField != null) { - // okay, populate using the entity field info... - this.induceFieldInfoFromEntityField(modelEntity, modelField, defaultFieldType); - return true; - } - } - } catch (GenericEntityException e) { - Debug.logError(e, module); - } + ModelEntity modelEntity = entityModelReader.getModelEntity(this.getEntityName()); + if (modelEntity != null) { + ModelField modelField = modelEntity.getField(this.getFieldName()); + if (modelField != null) { + // okay, populate using the entity field info... + this.induceFieldInfoFromEntityField(modelEntity, modelField, defaultFieldType); + return true; + } + } + } catch (GenericEntityException e) { + Debug.logError(e, module); + } return false; } @@ -708,7 +708,7 @@ if (genEnt.getModelEntity().isField(this.entryAcsr.getOriginalName())) { retVal = genEnt.get(this.entryAcsr.getOriginalName(), locale); } else { - //TODO: this may never come up, but if necessary use the FlexibleStringExander to eval the name first: String evaled = this.entryAcsr + //TODO: this may never come up, but if necessary use the FlexibleStringExander to eval the name first: String evaled = this.entryAcsr } } else { retVal = this.entryAcsr.get(dataMap, locale); @@ -1076,11 +1076,11 @@ } public String getIdName() { - if (UtilValidate.isNotEmpty(idName)) { + if (UtilValidate.isNotEmpty(idName)) { return idName; - } else { - return this.modelForm.getName() + "_" + this.getFieldName(); - } + } else { + return this.modelForm.getName() + "_" + this.getFieldName(); + } } public String getHeaderLink() { @@ -2070,7 +2070,7 @@ throw new IllegalArgumentException(errMsg); } } else if ("date".equals(type) && retVal.length() > 10) { - retVal = retVal.substring(0,10); + retVal = retVal.substring(0,10); } return retVal; } @@ -2408,89 +2408,89 @@ } public static class AutoComplete { - protected String autoSelect; - protected String frequency; - protected String minChars; - protected String choices; - protected String partialSearch; - protected String partialChars; - protected String ignoreCase; - protected String fullSearch; - - public AutoComplete(Element element) { - this.autoSelect = element.getAttribute("auto-select"); - this.frequency = element.getAttribute("frequency"); - this.minChars = element.getAttribute("min-chars"); - this.choices = element.getAttribute("choices"); - this.partialSearch = element.getAttribute("partial-search"); - this.partialChars = element.getAttribute("partial-chars"); - this.ignoreCase = element.getAttribute("ignore-case"); - this.fullSearch = element.getAttribute("full-search"); - } - - public String getAutoSelect() { - return this.autoSelect; - } - - public String getFrequency() { - return this.frequency; - } - - public String getMinChars() { - return this.minChars; - } - - public String getChoices() { - return this.choices; - } - - public String getPartialSearch() { - return this.partialSearch; - } - - public String getPartialChars() { - return this.partialChars; - } - - public String getIgnoreCase() { - return this.ignoreCase; - } - - public String getFullSearch() { - return this.fullSearch; - } - - public void setAutoSelect(String string) { - this.autoSelect = string; - } - - public void setFrequency(String string) { - this.frequency = string; - } - - public void setMinChars(String string) { - this.minChars = string; - } - - public void setChoices(String string) { - this.choices = string; - } - - public void setPartialSearch(String string) { - this.partialSearch = string; - } - - public void setPartialChars(String string) { - this.partialChars = string; - } - - public void setIgnoreCase(String string) { - this.ignoreCase = string; - } - - public void setFullSearch(String string) { - this.fullSearch = string; - } + protected String autoSelect; + protected String frequency; + protected String minChars; + protected String choices; + protected String partialSearch; + protected String partialChars; + protected String ignoreCase; + protected String fullSearch; + + public AutoComplete(Element element) { + this.autoSelect = element.getAttribute("auto-select"); + this.frequency = element.getAttribute("frequency"); + this.minChars = element.getAttribute("min-chars"); + this.choices = element.getAttribute("choices"); + this.partialSearch = element.getAttribute("partial-search"); + this.partialChars = element.getAttribute("partial-chars"); + this.ignoreCase = element.getAttribute("ignore-case"); + this.fullSearch = element.getAttribute("full-search"); + } + + public String getAutoSelect() { + return this.autoSelect; + } + + public String getFrequency() { + return this.frequency; + } + + public String getMinChars() { + return this.minChars; + } + + public String getChoices() { + return this.choices; + } + + public String getPartialSearch() { + return this.partialSearch; + } + + public String getPartialChars() { + return this.partialChars; + } + + public String getIgnoreCase() { + return this.ignoreCase; + } + + public String getFullSearch() { + return this.fullSearch; + } + + public void setAutoSelect(String string) { + this.autoSelect = string; + } + + public void setFrequency(String string) { + this.frequency = string; + } + + public void setMinChars(String string) { + this.minChars = string; + } + + public void setChoices(String string) { + this.choices = string; + } + + public void setPartialSearch(String string) { + this.partialSearch = string; + } + + public void setPartialChars(String string) { + this.partialChars = string; + } + + public void setIgnoreCase(String string) { + this.ignoreCase = string; + } + + public void setFullSearch(String string) { + this.fullSearch = string; + } } public static class TextField extends FieldInfo { @@ -2878,7 +2878,7 @@ Element autoCompleteElement = UtilXml.firstChildElement(element, "auto-complete"); if (autoCompleteElement != null) { - this.autoComplete = new AutoComplete(autoCompleteElement); + this.autoComplete = new AutoComplete(autoCompleteElement); } } @@ -2929,11 +2929,11 @@ } public AutoComplete getAutoComplete() { - return this.autoComplete; + return this.autoComplete; } public void setAutoComplete(AutoComplete newAutoComplete) { - this.autoComplete = newAutoComplete; + this.autoComplete = newAutoComplete; } public int getOtherFieldSize() { @@ -3311,7 +3311,7 @@ } public SubHyperlink getSubHyperlink() { - return this.subHyperlink; + return this.subHyperlink; } } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Fri Jan 23 03:08:47 2009 @@ -626,7 +626,7 @@ } // if we have an input method of time-dropdown, then render two dropdowns - if ("time-dropdown".equals(dateTimeField.getInputMethod())) { + if ("time-dropdown".equals(dateTimeField.getInputMethod())) { String className = modelFormField.getWidgetStyle(); String classString = (className != null ? " class=\"" + className + "\" " : ""); boolean isTwelveHour = "12".equals(dateTimeField.getClock()); @@ -721,9 +721,9 @@ String currentValue = modelFormField.getEntry(context); if (ajaxEnabled) { - writer.append("<input type=\"text\""); + writer.append("<input type=\"text\""); } else { - writer.append("<select"); + writer.append("<select"); } appendClassNames(writer, context, modelFormField); @@ -762,7 +762,7 @@ writer.append(modelFormField.getParameterName(context)); writer.append('"'); if (UtilValidate.isNotEmpty(idName)) { - writer.append(" id=\""); + writer.append(" id=\""); writer.append(idName); writer.append('"'); } @@ -782,24 +782,24 @@ writer.append("var data = {"); int count = 0; for (ModelFormField.OptionValue optionValue: allOptionValues) { - count++; + count++; writer.append("" + optionValue.getKey() + ": "); writer.append(" '" + optionValue.getDescription() + "'"); if (count != allOptionValues.size()) { - writer.append(", "); + writer.append(", "); } } writer.append("};"); appendWhitespace(writer); writer.append("ajaxAutoCompleteDropDown('" + textFieldIdName + "', '" + idName + "', data, {autoSelect: " + - autoComplete.getAutoSelect() + ", frequency: " + autoComplete.getFrequency() + ", minChars: " + autoComplete.getMinChars() + - ", choices: " + autoComplete.getChoices() + ", partialSearch: " + autoComplete.getPartialSearch() + - ", partialChars: " + autoComplete.getPartialChars() + ", ignoreCase: " + autoComplete.getIgnoreCase() + - ", fullSearch: " + autoComplete.getFullSearch() + "});"); + autoComplete.getAutoSelect() + ", frequency: " + autoComplete.getFrequency() + ", minChars: " + autoComplete.getMinChars() + + ", choices: " + autoComplete.getChoices() + ", partialSearch: " + autoComplete.getPartialSearch() + + ", partialChars: " + autoComplete.getPartialChars() + ", ignoreCase: " + autoComplete.getIgnoreCase() + + ", fullSearch: " + autoComplete.getFullSearch() + "});"); appendWhitespace(writer); writer.append("</script>"); } else { - writer.append('"'); + writer.append('"'); if (UtilValidate.isNotEmpty(idName)) { writer.append(" id=\""); @@ -928,7 +928,7 @@ writer.append("\n//--></script>"); } } - + this.makeHyperlinkString(writer, dropDownField.getSubHyperlink(), context); this.appendTooltip(writer, context, modelFormField); @@ -1143,7 +1143,7 @@ writer.append(action); writer.append('"'); } else { - //add single click JS onclick + //add single click JS onclick // disabling for now, using form onSubmit action instead: writer.append(singleClickAction); } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java Fri Jan 23 03:08:47 2009 @@ -177,10 +177,10 @@ } // If newValue is still empty, use the default value - if (this.defaultExdr != null) { - if (ObjectType.isEmpty(newValue)) { - newValue = this.defaultExdr.expandString(context); - } + if (this.defaultExdr != null) { + if (ObjectType.isEmpty(newValue)) { + newValue = this.defaultExdr.expandString(context); + } } if (UtilValidate.isNotEmpty(this.type)) { @@ -210,7 +210,7 @@ if (Debug.verboseOn()) Debug.logVerbose("In application setting value for field from [" + this.field.getOriginalName() + "]: " + newValue, module); } else { - if (Debug.verboseOn()) Debug.logVerbose("In screen setting field [" + this.field.getOriginalName() + "] to value: " + newValue, module); + if (Debug.verboseOn()) Debug.logVerbose("In screen setting field [" + this.field.getOriginalName() + "] to value: " + newValue, module); this.field.put(context, newValue); } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java Fri Jan 23 03:08:47 2009 @@ -153,7 +153,7 @@ public boolean eval(Map<String, Object> context) { // return false for the first one in the list that is false, basic and algo - for (MenuCondition subCondition: this.subConditions) { + for (MenuCondition subCondition: this.subConditions) { if (!subCondition.eval(context)) { return false; } @@ -173,7 +173,7 @@ public boolean eval(Map<String, Object> context) { // if more than one is true stop immediately and return false; if all are false return false; if only one is true return true boolean foundOneTrue = false; - for (MenuCondition subCondition: this.subConditions) { + for (MenuCondition subCondition: this.subConditions) { if (subCondition.eval(context)) { if (foundOneTrue) { // now found two true, so return false @@ -197,7 +197,7 @@ public boolean eval(Map<String, Object> context) { // return true for the first one in the list that is true, basic or algo - for (MenuCondition subCondition: this.subConditions) { + for (MenuCondition subCondition: this.subConditions) { if (subCondition.eval(context)) { return true; } @@ -546,8 +546,8 @@ } public boolean eval(Map<String, Object> context) { - - boolean passed = permissionChecker.runPermissionCheck(context); + + boolean passed = permissionChecker.runPermissionCheck(context); return passed; } } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Fri Jan 23 03:08:47 2009 @@ -247,7 +247,7 @@ public void renderMenuItemString(Appendable writer, Map<String, Object> context, MenuStringRenderer menuStringRenderer) throws IOException { - boolean passed = true; + boolean passed = true; if (this.condition != null) { if (!this.condition.eval(context)) { passed = false; Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java?rev=737003&r1=737002&r2=737003&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java Fri Jan 23 03:08:47 2009 @@ -542,7 +542,7 @@ } public boolean eval(Map<String, Object> context) { - return permissionChecker.runPermissionCheck(context); + return permissionChecker.runPermissionCheck(context); } } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |