svn commit: r751005 [2/3] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r751005 [2/3] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java Fri Mar 6 17:55:43 2009 @@ -98,7 +98,7 @@ GenericValue val = null; try { val = ContentWorker.getCurrentContent(delegator, trail, userLogin, templateCtx, nullThruDatesOnly, contentAssocPredicateId); - } catch(GeneralException e) { + } catch (GeneralException e) { throw new RuntimeException("Error getting current content. " + e.toString()); } //if (Debug.infoOn()) Debug.logInfo("in WrapSubContent, trail(1):" + trail, ""); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Fri Mar 6 17:55:43 2009 @@ -149,7 +149,7 @@ BigDecimal ruleQuantity = BigDecimal.ZERO; try { ruleQuantity = rule.getBigDecimal("quantity"); - } catch(Exception exc) { + } catch (Exception exc) { ruleQuantity = BigDecimal.ZERO; } @@ -201,7 +201,7 @@ oneChildNode.setProductAssoc(node); try { oneChildNode.setQuantityMultiplier(node.getBigDecimal("quantity")); - } catch(Exception nfe) { + } catch (Exception nfe) { oneChildNode.setQuantityMultiplier(BigDecimal.ONE); } try { @@ -216,7 +216,7 @@ percScrapFactor = BigDecimal.ONE; } oneChildNode.setScrapFactor(percScrapFactor); - } catch(Exception nfe) { + } catch (Exception nfe) { oneChildNode.setScrapFactor(BigDecimal.ONE); } BOMNode newNode = oneChildNode; @@ -393,7 +393,7 @@ BigDecimal bomQuantity = BigDecimal.ZERO; try { bomQuantity = oneChild.getBigDecimal("quantity"); - } catch(Exception exc) { + } catch (Exception exc) { bomQuantity = BigDecimal.ONE; } oneChildNode = (BOMNode)childrenNodes.get(i); @@ -415,7 +415,7 @@ if (genericService != null && genericService.getString("customMethodName") != null) { serviceName = genericService.getString("customMethodName"); } - } catch(Exception exc) { + } catch (Exception exc) { } } if (serviceName != null) { @@ -641,7 +641,7 @@ } } } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { Debug.logError("Problem in BOMNode.isWarehouseManaged()", module); } return isWarehouseManaged; @@ -656,7 +656,7 @@ List supplierProducts = null; try { supplierProducts = product.getRelated("SupplierProduct", UtilMisc.toMap("supplierPrefOrderId", "10_MAIN_SUPPL"), UtilMisc.toList("minimumOrderQuantity")); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { Debug.logError("Problem in BOMNode.isManufactured()", module); } supplierProducts = EntityUtil.filterByDate(supplierProducts, UtilDateTime.nowTimestamp(), "availableFromDate", "availableThruDate", true); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Fri Mar 6 17:55:43 2009 @@ -86,7 +86,7 @@ while (bomTypesValuesIt.hasNext()) { bomTypes.add(((GenericValue)bomTypesValuesIt.next()).getString("productAssocTypeId")); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error running max depth algorithm: " + gee.getMessage()); } } else { @@ -104,7 +104,7 @@ maxDepth = depth; } } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error running max depth algorithm: " + gee.getMessage()); } result.put("depth", new Long(maxDepth)); @@ -229,7 +229,7 @@ try { Map depthResult = dispatcher.runSync("updateLowLevelCode", UtilMisc.<String, Object>toMap("productIdTo", product.getString("productId"), "alsoComponents", Boolean.valueOf(false), "alsoVariants", Boolean.valueOf(false))); Debug.logInfo("Product [" + product.getString("productId") + "] Low Level Code [" + depthResult.get("lowLevelCode") + "]", module); - } catch(Exception exc) { + } catch (Exception exc) { Debug.logWarning(exc.getMessage(), module); } } @@ -264,7 +264,7 @@ GenericValue duplicatedProductAssoc = null; try { duplicatedProductAssoc = BOMHelper.searchDuplicatedAncestor(productId, productIdKey, bomType, fromDate, delegator, dispatcher, userLogin); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error running duplicated ancestor search: " + gee.getMessage()); } result.put("duplicatedProductAssoc", duplicatedProductAssoc); @@ -311,7 +311,7 @@ BOMTree tree = null; try { tree = new BOMTree(productId, bomType, fromDate, type.intValue(), delegator, dispatcher, userLogin); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error creating bill of materials tree: " + gee.getMessage()); } if (tree != null && quantity != null) { @@ -377,7 +377,7 @@ tree.setRootAmount(amount); tree.print(components, excludeWIPs.booleanValue()); if (components.size() > 0) components.remove(0); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error creating bill of materials tree: " + gee.getMessage()); } // @@ -397,7 +397,7 @@ if (routing != null) { workEffortId = routing.getString("workEffortId"); } - } catch(GenericServiceException gse) { + } catch (GenericServiceException gse) { Debug.logWarning(gse.getMessage(), module); } if (workEffortId != null) { @@ -455,7 +455,7 @@ tree.setRootQuantity(quantity); tree.setRootAmount(amount); tree.print(components); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error creating bill of materials tree: " + gee.getMessage()); } Iterator componentsIt = components.iterator(); @@ -485,14 +485,14 @@ if (!UtilValidate.isEmpty(packages)) { return ServiceUtil.returnError("Packages already found."); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error loading the ShipmentPackages"); } // ShipmentItems are loaded List shipmentItems = null; try { shipmentItems = delegator.findByAnd("ShipmentItem", UtilMisc.toMap("shipmentId", shipmentId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error loading the ShipmentItems"); } Iterator shipmentItemsIt = shipmentItems.iterator(); @@ -780,7 +780,7 @@ tree = new BOMTree(productId, "MANUF_COMPONENT", fromDate, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); tree.getProductsInPackages(components); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error creating bill of materials tree: " + gee.getMessage()); } Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java Fri Mar 6 17:55:43 2009 @@ -153,7 +153,7 @@ } else { root.loadChildren(bomTypeId, inDate, productFeatures, type); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { root = null; } this.bomTypeId = bomTypeId; Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Fri Mar 6 17:55:43 2009 @@ -424,7 +424,7 @@ Map resultService = dispatcher.runSync(serviceName, serviceContext); totalTaskTime = ((Double)resultService.get("totalTime")).doubleValue(); } - } catch(Exception exc) { + } catch (Exception exc) { Debug.logError(exc, "Problem calling the customMethod service " + serviceName); } } Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java Fri Mar 6 17:55:43 2009 @@ -56,7 +56,7 @@ BigDecimal quantity = null; try { quantity = new BigDecimal((String)parameters.get("quantity")); - } catch(NumberFormatException nfe) { + } catch (NumberFormatException nfe) { String errMsg = "Invalid format for quantity field: " + nfe.toString(); Debug.logError(nfe, errMsg, module); request.setAttribute("_ERROR_MESSAGE_", errMsg); @@ -69,7 +69,7 @@ Timestamp fromDate = null; try { fromDate = Timestamp.valueOf((String)componentRow.get("fromDate")); - } catch(IllegalArgumentException iae) { + } catch (IllegalArgumentException iae) { String errMsg = "Invalid format for date field: " + iae.toString(); Debug.logError(iae, errMsg, module); request.setAttribute("_ERROR_MESSAGE_", errMsg); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Fri Mar 6 17:55:43 2009 @@ -228,7 +228,7 @@ Map routingOutMap = dispatcher.runSync("getProductRouting", routingInMap); routing = (GenericValue)routingOutMap.get("routing"); routingTaskAssocs = (List)routingOutMap.get("tasks"); - } catch(GenericServiceException gse) { + } catch (GenericServiceException gse) { Debug.logWarning(gse.getMessage(), module); } // ================================= @@ -607,7 +607,7 @@ return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunStatusNotChangedMandatoryProductionRunNotCompleted", locale)); } } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunStatusNotChanged", locale)); } @@ -909,7 +909,7 @@ } result.put("totalCost", totalCost); result.put("totalCostNoMaterials", totalCostNoMaterials); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Cannot retrieve costs for work effort [" + workEffortId + "]: " + gee.getMessage()); } return result; @@ -932,7 +932,7 @@ totalCost = totalCost.add(taskCost); } result.put("totalCost", totalCost); - } catch(Exception exc) { + } catch (Exception exc) { return ServiceUtil.returnError("Cannot retrieve costs for production run [" + workEffortId + "]: " + exc.getMessage()); } return result; @@ -1012,7 +1012,7 @@ dispatcher.runSync(customMethod.getString("customMethodName"), inMap); } } - } catch(Exception e) { + } catch (Exception e) { return ServiceUtil.returnError("Unable to create routing costs for the production run task [" + productionRunTaskId + "]: " + e.getMessage()); } // materials costs: these are the costs derived from the materials used by the production run task @@ -1044,7 +1044,7 @@ inMap.put("cost", materialsCost); dispatcher.runSync("createCostComponent", inMap); } - } catch(Exception e) { + } catch (Exception e) { return ServiceUtil.returnError("Unable to create materials costs for the production run task [" + productionRunTaskId + "]: " + e.getMessage()); } return ServiceUtil.returnSuccess(); @@ -1563,7 +1563,7 @@ serviceContext.put("userLogin", userLogin); resultService = dispatcher.runSync("balanceInventoryItems", serviceContext); } - } catch(Exception exc) { + } catch (Exception exc) { return ServiceUtil.returnError(exc.getMessage()); } } else { @@ -1603,7 +1603,7 @@ serviceContext.put("priorityOrderItemSeqId", orderItem.getString("orderItemSeqId")); } resultService = dispatcher.runSync("balanceInventoryItems", serviceContext); - } catch(Exception exc) { + } catch (Exception exc) { return ServiceUtil.returnError(exc.getMessage()); } } @@ -1751,7 +1751,7 @@ serviceContext.put("userLogin", userLogin); resultService = dispatcher.runSync("balanceInventoryItems", serviceContext); } - } catch(Exception exc) { + } catch (Exception exc) { return ServiceUtil.returnError(exc.getMessage()); } } else { @@ -1787,7 +1787,7 @@ serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); resultService = dispatcher.runSync("balanceInventoryItems", serviceContext); - } catch(Exception exc) { + } catch (Exception exc) { return ServiceUtil.returnError(exc.getMessage()); } } @@ -1835,7 +1835,7 @@ if (quantity.compareTo(totalIssued.subtract(totalReturned)) > 0) { return ServiceUtil.returnError("Production Run Task with id [" + productionRunTaskId + "] cannot return more items [" + quantity + "] than the ones currently allocated [" + (totalIssued.subtract(totalReturned)) + "]"); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError(gee.getMessage()); } String inventoryItemTypeId = (String)context.get("inventoryItemTypeId"); @@ -1851,7 +1851,7 @@ if (ServiceUtil.isError(inventoryResult)) { return ServiceUtil.returnError("Error calling productionRunTaskProduce: " + ServiceUtil.getErrorMessage(inventoryResult)); } - } catch(GenericServiceException exc) { + } catch (GenericServiceException exc) { return ServiceUtil.returnError(exc.getMessage()); } return ServiceUtil.returnSuccess(); @@ -1990,9 +1990,9 @@ Map resultService = dispatcher.runSync("issueProductionRunTaskComponent", serviceContext); } } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { - } catch(GenericServiceException gee) { + } catch (GenericServiceException gee) { } } @@ -2024,7 +2024,7 @@ serviceContext.put("quantityRejected", totalQuantityRejected); serviceContext.put("userLogin", userLogin); Map resultService = dispatcher.runSync("updateWorkEffort", serviceContext); - } catch(Exception exc) { + } catch (Exception exc) { return ServiceUtil.returnError(exc.getMessage()); } @@ -2042,7 +2042,7 @@ GenericValue requirement = null; try { requirement = delegator.findByPrimaryKey("Requirement", UtilMisc.toMap("requirementId", requirementId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { } if (requirement == null) { @@ -2070,7 +2070,7 @@ GenericValue requirement = null; try { requirement = delegator.findByPrimaryKey("Requirement", UtilMisc.toMap("requirementId", requirementId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { } if (requirement == null) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingRequirementNotExists", locale)); @@ -2392,7 +2392,7 @@ orderItem.set("quantity", quantity); } orderItems = UtilMisc.toList(orderItem); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error reading the OrderItem: " + gee.getMessage()); } } else { @@ -2401,7 +2401,7 @@ if (orderItems == null) { return ServiceUtil.returnError("OrderItems for order [" + orderId + "] not found."); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error reading the OrderItems: " + gee.getMessage()); } } @@ -2421,7 +2421,7 @@ Debug.logWarning("Production Run for order item [" + orderItem.getString("orderId") + "/" + orderItem.getString("orderItemSeqId") + "] already exists.", module); continue; } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error reading the WorkOrderItemFulfillment: " + gee.getMessage()); } if (orderItem.get("selectedAmount") != null) { @@ -2437,7 +2437,7 @@ tree.setRootAmount(amount); tree.print(components); tree.createManufacturingOrders(null, fromDate, null, null, null, orderId, orderItem.getString("orderItemSeqId"), shipmentId, userLogin); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error creating bill of materials tree: " + gee.getMessage()); } } @@ -2470,7 +2470,7 @@ tree.setRootAmount(BigDecimal.ZERO); tree.print(components); workEffortId = tree.createManufacturingOrders(facilityId, startDate, workEffortName, description, routingId, null, null, null, userLogin); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error creating bill of materials tree: " + gee.getMessage()); } if (workEffortId == null) { @@ -3020,7 +3020,7 @@ } } } - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, "Error", module); return ServiceUtil.returnError("Problem running the setEstimatedDeliveryDates service"); } Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Fri Mar 6 17:55:43 2009 @@ -78,14 +78,14 @@ try { listResult = delegator.findList("MrpEvent", null, null, null, null, false); //int numOfRecordsRemoved = delegator.removeByCondition("MrpEvent", null); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e,"Error : findList(\"MrpEvent\", null, null, null, null, false)", module); return ServiceUtil.returnError("Problem, we can not find all the items of MrpEvent, for more detail look at the log"); } if (listResult != null) { try { delegator.removeAll(listResult); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e,"Error : removeAll(listResult), listResult ="+listResult, module); return ServiceUtil.returnError("Problem, we can not remove the MrpEvent items, for more detail look at the log"); } @@ -96,7 +96,7 @@ List listResultRoles = new ArrayList(); try { listResult = delegator.findByAnd("Requirement", UtilMisc.toMap("requirementTypeId", "PRODUCT_REQUIREMENT", "statusId", "REQ_PROPOSED")); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { return ServiceUtil.returnError("Problem, we can not find all the items of MrpEvent, for more detail look at the log"); } if (listResult != null) { @@ -109,20 +109,20 @@ } delegator.removeAll(listResultRoles); delegator.removeAll(listResult); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { return ServiceUtil.returnError("Problem, we can not remove the MrpEvent items, for more detail look at the log"); } } listResult = null; try { listResult = delegator.findByAnd("Requirement", UtilMisc.toMap("requirementTypeId", "INTERNAL_REQUIREMENT", "statusId", "REQ_PROPOSED")); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { return ServiceUtil.returnError("Problem, we can not find all the items of MrpEvent, for more detail look at the log"); } if (listResult != null) { try { delegator.removeAll(listResult); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { return ServiceUtil.returnError("Problem, we can not remove the MrpEvent items, for more detail look at the log"); } } @@ -150,7 +150,7 @@ parameters.put("facilityId", facilityId); try { resultList = delegator.findByAnd("OrderHeaderItemAndShipGroup", parameters, UtilMisc.toList("orderId")); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, "Error : findByAnd(\"OrderItem\", parameters\")", module); Debug.logError(e, "Error : parameters = "+parameters,module); return ServiceUtil.returnError("Problem, we can not find the order items, for more detail look at the log"); @@ -213,7 +213,7 @@ parameters = UtilMisc.toMap("requirementTypeId", "PRODUCT_REQUIREMENT", "statusId", "REQ_APPROVED", "facilityId", facilityId); try { resultList = delegator.findByAnd("Requirement", parameters); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { return ServiceUtil.returnError("Problem, we can not find all the items of MrpEvent, for more detail look at the log"); } iteratorResult = resultList.iterator(); @@ -253,7 +253,7 @@ Set fieldsToSelect = UtilMisc.toSet("orderId", "orderItemSeqId", "productId", "quantity", "cancelQuantity", "oiEstimatedDeliveryDate"); resultList = delegator.findList("OrderHeaderItemAndShipGroup", EntityCondition.makeCondition(searchConditions, EntityOperator.AND), fieldsToSelect, UtilMisc.toList("orderDate"), null, false); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { return ServiceUtil.returnError("Problem, we can not find the order items, for more detail look at the log"); } iteratorResult = resultList.iterator(); @@ -322,7 +322,7 @@ parameters = UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED", "statusId", "WEGS_CREATED", "facilityId", facilityId); try { resultList = delegator.findByAnd("WorkEffortAndGoods", parameters); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, "Error : findByAnd(\"OrderItem\", parameters\")", module); Debug.logError(e, "Error : parameters = "+parameters,module); return ServiceUtil.returnError("Problem, we can not find the order items, for more detail look at the log"); @@ -354,7 +354,7 @@ parameters = UtilMisc.toMap("workEffortGoodStdTypeId", "PRUN_PROD_DELIV", "statusId", "WEGS_CREATED", "workEffortTypeId", "PROD_ORDER_HEADER", "facilityId", facilityId); try { resultList = delegator.findByAnd("WorkEffortAndGoods", parameters); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, "Error : findByAnd(\"OrderItem\", parameters\")", module); Debug.logError(e, "Error : parameters = "+parameters,module); return ServiceUtil.returnError("Problem, we can not find the order items, for more detail look at the log"); @@ -400,7 +400,7 @@ parameters = UtilMisc.toMap("facilityId", facilityId); try { resultList = delegator.findByAnd("ProductFacility", parameters); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, "Unable to retrieve ProductFacility records.", module); return ServiceUtil.returnError("Unable to retrieve ProductFacility records."); } @@ -418,7 +418,7 @@ if (numOfEvents > 0) { continue; } - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, "Unable to count MrpEvent records.", module); return ServiceUtil.returnError("Unable to count MrpEvent records."); } @@ -691,7 +691,7 @@ } try { listInventoryEventForMRP = delegator.findList("MrpEventView", filterByConditions, null, UtilMisc.toList("productId", "eventDate"), null, false); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { return ServiceUtil.returnError("MRP Error retieving MRP event for the bom level: " + bomLevel + ". Error: " + e.getMessage()); } Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java Fri Mar 6 17:55:43 2009 @@ -119,7 +119,7 @@ tree.setRootQuantity(quantity); tree.print(components, true); if (components.size() > 0) components.remove(0); - } catch(Exception exc) { + } catch (Exception exc) { Debug.logWarning(exc.getMessage(), module); tree = null; } @@ -129,7 +129,7 @@ routing = (GenericValue)routingOutMap.get("routing"); } } - } catch(GenericServiceException gse) { + } catch (GenericServiceException gse) { Debug.logWarning(gse.getMessage(), module); } } @@ -141,7 +141,7 @@ Map routingTasksInMap = UtilMisc.toMap("workEffortId", routing.getString("workEffortId"), "userLogin", userLogin); Map routingTasksOutMap = dispatcher.runSync("getRoutingTaskAssocs", routingTasksInMap); listRoutingTaskAssoc = (List)routingTasksOutMap.get("routingTaskAssocs"); - } catch(GenericServiceException gse) { + } catch (GenericServiceException gse) { Debug.logWarning(gse.getMessage(), module); } } @@ -189,7 +189,7 @@ try { GenericValue techDataCalendar = product.getDelegator().findByPrimaryKeyCache("TechDataCalendar", UtilMisc.toMap("calendarId", "SUPPLIER")); startDate = TechDataServices.addBackward(techDataCalendar, endDate, timeToShip); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, "Error : reading SUPPLIER TechDataCalendar: " + e.getMessage(), module); } } Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java Fri Mar 6 17:55:43 2009 @@ -66,7 +66,7 @@ GenericValue task = null; try { task = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", taskId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { ServiceUtil.returnError("Error finding routing task with id: " + taskId); } // FIXME: the ProductionRun.getEstimatedTaskTime(...) method will be removed and Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java Fri Mar 6 17:55:43 2009 @@ -172,7 +172,7 @@ } catch (GenericEntityException e) { Debug.logError("Pb reading TechDataCalendar associated with machineGroup"+e.getMessage(), module); } - }else { + } else { try { List machines = machineGroup.getRelatedCache("ChildFixedAsset"); if (machines != null && machines.size()>0) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Fri Mar 6 17:55:43 2009 @@ -258,7 +258,7 @@ List returnItemResponses = new ArrayList(); try { returnItemResponses = orderHeader.getDelegator().findByAnd("ReturnItemResponse", UtilMisc.toMap("orderPaymentPreferenceId", paymentPref.getString("orderPaymentPreferenceId"))); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, module); } BigDecimal refundedToPaymentPref = ZERO; Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Fri Mar 6 17:55:43 2009 @@ -423,7 +423,7 @@ GenericValue item = null; try { item = orderItemQuantityIssued.getRelatedOne("OrderItem"); - } catch( GenericEntityException e ) { + } catch ( GenericEntityException e ) { Debug.logError(e, module); return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderErrorUnableToGetOrderItemInformation", locale)); } @@ -931,7 +931,7 @@ if (UtilValidate.isNotEmpty(orgAcctgPref)) { try { refundPaymentMethod = orgAcctgPref.getRelatedOne("PaymentMethod"); - } catch( GenericEntityException e ) { + } catch ( GenericEntityException e ) { Debug.logError("Error retrieving related refundPaymentMethod from PartyAcctgPreference for partyId " + productStore.get("payToPartyId"), module); } } @@ -1001,7 +1001,7 @@ List otherPaymentMethodTypes = new ArrayList(); try { otherPaymentMethodTypes = delegator.findList("PaymentMethodType", pmtConditionList, null, null, null, true); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, "Cannot get PaymentMethodTypes", module); return ServiceUtil.returnError("Problems getting PaymentMethodTypes: " + e.toString()); } @@ -1539,7 +1539,7 @@ GenericValue newOrderItemShipGroupAssoc = delegator.makeValue("OrderItemShipGroupAssoc", UtilMisc.toMap("orderItemSeqId", newItem.getString("orderItemSeqId"), "shipGroupSeqId", orderItemShipGroupAssoc.getString("shipGroupSeqId"), "quantity", quantity)); orderItemShipGroupInfo.add(newOrderItemShipGroupAssoc); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { Debug.logError(gee, module); } // Create an association between the replacement order item and the order item of the original order @@ -1595,7 +1595,7 @@ Map priceResult = null; try { priceResult = dispatcher.runSync("calculateProductPrice", priceContext); - } catch(GenericServiceException gse) { + } catch (GenericServiceException gse) { Debug.logError(gse, module); continue; } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Mar 6 17:55:43 2009 @@ -1418,7 +1418,7 @@ List orderTaxAdjustments = null; try { orderTaxAdjustments = delegator.findByAnd("OrderAdjustment", UtilMisc.toMap("orderId", orderId, "orderAdjustmentTypeId", "SALES_TAX")); - } catch( GenericEntityException e ) { + } catch ( GenericEntityException e ) { Debug.logError(e, "Unable to retrieve SALES_TAX adjustments for order : " + orderId, module); return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderUnableToRetrieveSalesTaxAdjustments",locale)); } @@ -1578,7 +1578,7 @@ Map createOrderAdjResponse = null; try { createOrderAdjResponse = dispatcher.runSync("createOrderAdjustment", createOrderAdjContext); - } catch( GenericServiceException e ) { + } catch ( GenericServiceException e ) { String createOrderAdjErrMsg = UtilProperties.getMessage(resource_error, "OrderErrorCallingCreateOrderAdjustmentService", locale); Debug.logError(createOrderAdjErrMsg, module); return ServiceUtil.returnError(createOrderAdjErrMsg); @@ -4432,7 +4432,7 @@ sci.setAssociatedOrderItemSeqId(item.getString("orderItemSeqId")); sci.setOrderItemAssocTypeId("DROP_SHIPMENT"); // TODO: we should consider also the ship group in the association between sales and purchase orders - } catch(Exception e) { + } catch (Exception e) { ServiceUtil.returnError("The following error occurred creating drop shipments for order [" + orderId + "]: " + e.getMessage()); } } @@ -4460,7 +4460,7 @@ } } } - } catch(Exception exc) { + } catch (Exception exc) { // TODO: imporve error handling ServiceUtil.returnError("The following error occurred creating drop shipments for order [" + orderId + "]: " + exc.getMessage()); } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Fri Mar 6 17:55:43 2009 @@ -272,7 +272,7 @@ } } } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { Debug.logWarning("Error copying billing account terms to order terms: " + gee.getMessage(), module); } } else { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Fri Mar 6 17:55:43 2009 @@ -2120,7 +2120,7 @@ GenericValue shippingAddress = null; try { shippingAddress = this.getDelegator().findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", shippingContactMechId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { Debug.logError(gee, "Error retrieving the shipping address for contactMechId [" + shippingContactMechId + "].", module); } if (shippingAddress != null) { @@ -4422,7 +4422,7 @@ GenericValue shippingAddress = null; try { shippingAddress = item.getDelegator().findByPrimaryKey("PostalAddress", UtilMisc.toMap("contactMechId", this.internalContactMechId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { Debug.logError(gee, "Error retrieving the shipping address for contactMechId [" + this.internalContactMechId + "].", module); } if (shippingAddress != null) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Fri Mar 6 17:55:43 2009 @@ -162,7 +162,7 @@ Object object = paramMap.remove("add_product_id"); try { productId = (String) object; - } catch(ClassCastException e) { + } catch (ClassCastException e) { productId = (String)((List)object).get(0); } } @@ -845,7 +845,7 @@ if (UtilValidate.isNotEmpty(cartIndexStr) && UtilValidate.isInteger(cartIndexStr)) { try { cartIndex = Integer.parseInt(cartIndexStr); - } catch(NumberFormatException nfe) { + } catch (NumberFormatException nfe) { Debug.logWarning("Invalid value for cart index =" + cartIndexStr, module); } } @@ -882,7 +882,7 @@ if (UtilValidate.isNotEmpty(cartIndexStr) && UtilValidate.isInteger(cartIndexStr)) { try { cartIndex = Integer.parseInt(cartIndexStr); - } catch(NumberFormatException nfe) { + } catch (NumberFormatException nfe) { Debug.logWarning("Invalid value for cart index =" + cartIndexStr, module); } } @@ -1230,7 +1230,7 @@ UtilMisc.<String, Object>toMap("shoppingListId", shoppingListId, "userLogin", userLogin)); cart = (ShoppingCart)outMap.get("shoppingCart"); - } catch(GenericServiceException exc) { + } catch (GenericServiceException exc) { request.setAttribute("_ERROR_MESSAGE_", exc.getMessage()); return "error"; } @@ -1410,7 +1410,7 @@ try { storeReps = delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId", productStore.getString("productStoreId"), "partyId", userLogin.getString("partyId"), "roleTypeId", "SALES_REP")); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { // } storeReps = EntityUtil.filterByDate(storeReps); @@ -1457,7 +1457,7 @@ GenericValue thisUserLogin = null; try { thisUserLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", userLoginId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { // } if (thisUserLogin != null) { @@ -1470,7 +1470,7 @@ GenericValue thisParty = null; try { thisParty = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { // } if (thisParty == null) { @@ -1529,7 +1529,7 @@ if (promo != null) { manualPromotions.add(promo); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { request.setAttribute("_ERROR_MESSAGE_", gee.getMessage()); return "error"; } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Fri Mar 6 17:55:43 2009 @@ -474,7 +474,7 @@ GenericValue requirement = null; try { requirement = delegator.findByPrimaryKey("Requirement", UtilMisc.toMap("requirementId", requirementId)); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { } if (requirement == null) { return ServiceUtil.returnError("Requirement with id [" + requirementId + "] doesn't exist."); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Fri Mar 6 17:55:43 2009 @@ -164,7 +164,7 @@ sendEmailToContactListContext.put("userLogin", userLogin); try { dispatcher.runAsync("sendEmailToContactList", sendEmailToContactListContext); - } catch( GenericServiceException e ) { + } catch ( GenericServiceException e ) { String errMsg = UtilProperties.getMessage(resource, "commeventservices.errorCallingSendEmailToContactListService", locale); Debug.logError(e, errMsg, module); errorMessages.add(errMsg); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java Fri Mar 6 17:55:43 2009 @@ -74,9 +74,9 @@ } else { configWrapper = new ProductConfigWrapper(productConfigCache.get(cacheKey)); } - } catch(ProductConfigWrapperException we) { + } catch (ProductConfigWrapperException we) { configWrapper = null; - } catch(Exception e) { + } catch (Exception e) { Debug.logWarning(e.getMessage(), module); } return configWrapper; @@ -97,7 +97,7 @@ if (UtilValidate.isNotEmpty(comments)) { try { configWrapper.setSelected(k, i, comments); - } catch(Exception e) { + } catch (Exception e) { Debug.logWarning(e.getMessage(), module); } } @@ -167,7 +167,7 @@ } } } - } catch(Exception e) { + } catch (Exception e) { Debug.logWarning(e.getMessage(), module); } } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java Fri Mar 6 17:55:43 2009 @@ -184,7 +184,7 @@ try { op = new AffineTransformOp(tx, rh); - } catch(ImagingOpException e) { + } catch (ImagingOpException e) { String errMsg = UtilProperties.getMessage(resource, "ScaleImage.transform_is_non_invertible", locale) + e.toString(); Debug.logError(errMsg, module); result.put("errorMessage", errMsg); @@ -217,12 +217,12 @@ // write new image try { ImageIO.write(op.filter(bufImg, bufNewImg), imgExtension, new File(imageServerPath + "/" + newFilePathPrefix + filenameToUse)); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { String errMsg = UtilProperties.getMessage(resource, "ScaleImage.one_parameter_is_null", locale) + e.toString(); Debug.logError(errMsg, module); result.put("errorMessage", errMsg); return result; - } catch(IOException e) { + } catch (IOException e) { String errMsg = UtilProperties.getMessage(resource, "ScaleImage.error_occurs_during_writing", locale) + e.toString(); Debug.logError(errMsg, module); result.put("errorMessage", errMsg); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Fri Mar 6 17:55:43 2009 @@ -486,7 +486,7 @@ GenericValue customMethod = null; try { customMethod = defaultPriceValue.getRelatedOne("CustomMethod"); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { Debug.logError(gee, "An error occurred while getting the customPriceCalcService", module); } if (UtilValidate.isNotEmpty(customMethod) && UtilValidate.isNotEmpty(customMethod.getString("customMethodName"))) { @@ -511,7 +511,7 @@ validPriceFound = true; } } - } catch(GenericServiceException gse) { + } catch (GenericServiceException gse) { Debug.logError(gse, "An error occurred while running the customPriceCalcService [" + customMethod.getString("customMethodName") + "]", module); } } @@ -1313,7 +1313,7 @@ return ServiceUtil.returnError(errMsg); } productSuppliers = UtilGenerics.checkList(priceResult.get("supplierProducts")); - } catch(GenericServiceException gse) { + } catch (GenericServiceException gse) { Debug.logError(gse, module); return ServiceUtil.returnError(gse.getMessage()); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Fri Mar 6 17:55:43 2009 @@ -964,11 +964,11 @@ Map<String, Object> resultResize = FastMap.newInstance(); try { resultResize.putAll(imageTransform.scaleImageInAllSize(context, filenameToUse, "additional", viewNumber)); - } catch(IOException e) { + } catch (IOException e) { String errMsg = "Scale additional image in all different sizes is impossible : " + e.toString(); Debug.logError(e, errMsg, module); return ServiceUtil.returnError(errMsg); - } catch(JDOMException e) { + } catch (JDOMException e) { String errMsg = "Errors occur in parsing ImageProperties.xml : " + e.toString(); Debug.logError(e, errMsg, module); return ServiceUtil.returnError(errMsg); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java Fri Mar 6 17:55:43 2009 @@ -209,7 +209,7 @@ return ServiceUtil.returnError("Error processing subscriptions for Product with ID [" + productId + "]", null, null, processExtendSubscriptionResult); } } - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, e.toString(), module); return ServiceUtil.returnError(e.toString()); } @@ -266,7 +266,7 @@ } } } - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e.toString(), module); return ServiceUtil.returnError(e.toString()); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java Fri Mar 6 17:55:43 2009 @@ -115,7 +115,7 @@ } catch (GenericEntityException ex) { Debug.logError(ex, ex.getMessage(), module); return ServiceUtil.returnError(ex.getMessage()); - } catch(Exception ex) { + } catch (Exception ex) { Debug.logError(ex, ex.getMessage(), module); return ServiceUtil.returnError(ex.getMessage()); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Fri Mar 6 17:55:43 2009 @@ -892,9 +892,9 @@ serviceContext.put("shippableTotal", shippableTotal); serviceResult = getDispatcher().runSync("calcShipmentCostEstimate", serviceContext); - } catch( GenericEntityException e ) { + } catch ( GenericEntityException e ) { Debug.logError(e, module); - } catch( GenericServiceException e ) { + } catch ( GenericServiceException e ) { Debug.logError(e, module); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java Fri Mar 6 17:55:43 2009 @@ -357,7 +357,7 @@ result.put("meterNumber", meterNumber); - } catch( GenericEntityException e ) { + } catch ( GenericEntityException e ) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Fri Mar 6 17:55:43 2009 @@ -1540,7 +1540,7 @@ GenericValue destCountryGeo = null; try { destCountryGeo = shipToAddress.getRelatedOne("CountryGeo"); - } catch( GenericEntityException e ) { + } catch ( GenericEntityException e ) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } @@ -1563,7 +1563,7 @@ try { return dctx.getDispatcher().runSync("upsRateEstimateByPostalCode", cxt); - } catch(GenericServiceException e) { + } catch (GenericServiceException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Fri Mar 6 17:55:43 2009 @@ -723,7 +723,7 @@ outgoingProductionRunList.add(outgoingProductionRun); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError("Error retrieving manufacturing data for productId [" + productId + "]: " + gee.getMessage()); } Map<String, Object> resultMap = ServiceUtil.returnSuccess(); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java Fri Mar 6 17:55:43 2009 @@ -224,14 +224,14 @@ if (value == null) { try { value = this.resourceBundle.getObject((String) arg0); - } catch(MissingResourceException mre) { + } catch (MissingResourceException mre) { // do nothing, this will be handled by recognition that the value is still null } } if (value == null) { try { value = this.resourceBundle.getString((String) arg0); - } catch(MissingResourceException mre) { + } catch (MissingResourceException mre) { // do nothing, this will be handled by recognition that the value is still null } } Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Fri Mar 6 17:55:43 2009 @@ -373,7 +373,7 @@ Object o = null; try { o = args.get(key); - } catch(TemplateModelException e) { + } catch (TemplateModelException e) { Debug.logVerbose(e.getMessage(), module); return returnObj; } @@ -384,7 +384,7 @@ Object ctxObj = null; try { ctxObj = args.get("context"); - } catch(TemplateModelException e) { + } catch (TemplateModelException e) { Debug.logInfo(e.getMessage(), module); return returnObj; } @@ -399,7 +399,7 @@ if (templateContext != null) { returnObj = (String)templateContext.get(key); } - } catch(ClassCastException e2) { + } catch (ClassCastException e2) { //return null; } */ @@ -566,7 +566,7 @@ TemplateModel templateModelObj = null; try { templateModelObj = wrapper.wrap(obj); - } catch(TemplateModelException e) { + } catch (TemplateModelException e) { throw new RuntimeException(e.getMessage()); } return templateModelObj; Modified: ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java (original) +++ ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java Fri Mar 6 17:55:43 2009 @@ -63,7 +63,7 @@ try { // TODO: improve performance lastDimensionValue = EntityUtil.getFirst(delegator.findByAnd(dimensionEntityName, naturalKeyFields, UtilMisc.toList("-createdTxStamp"))); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError(gee.getMessage()); } if (UtilValidate.isNotEmpty(lastDimensionValue)) { @@ -91,7 +91,7 @@ List<GenericValue> existingDimensionValues = null; try { existingDimensionValues = delegator.findByAnd(dimensionValue.getEntityName(), andCondition); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError(gee.getMessage()); } if (UtilValidate.isEmpty(existingDimensionValues)) { @@ -113,7 +113,7 @@ return ServiceUtil.returnError("The update mode: " + updateMode + " is still not supported."); } } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError(gee.getMessage()); } return ServiceUtil.returnSuccess(); Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Fri Mar 6 17:55:43 2009 @@ -419,7 +419,7 @@ try { MultiPointSender mps = (MultiPointSender)Class.forName(ContainerConfig.getPropertyValue(clusterProps, "replication-mode", "org.apache.catalina.tribes.transport.bio.PooledMultiSender")).newInstance(); trans.setTransport(mps); - } catch(Exception exc) { + } catch (Exception exc) { throw new ContainerException("Cluster configuration requires a valid replication-mode property: " + exc.getMessage()); } String mgrClassName = ContainerConfig.getPropertyValue(clusterProps, "manager-class", "org.apache.catalina.cluster.session.DeltaManager"); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Fri Mar 6 17:55:43 2009 @@ -258,7 +258,7 @@ /* try { newEntity.remove(); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logError(e, module); } */ Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java Fri Mar 6 17:55:43 2009 @@ -71,12 +71,12 @@ /* BUFFERED IMAGE */ try { bufImg = ImageIO.read(new File(fileLocation)); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { String errMsg = UtilProperties.getMessage(resource, "ImageTransform.input_is_null", locale) + " : " + fileLocation + " ; " + e.toString(); Debug.logError(errMsg, module); result.put("errorMessage", errMsg); return result; - } catch(IOException e) { + } catch (IOException e) { String errMsg = UtilProperties.getMessage(resource, "ImageTransform.error_occurs_during_reading", locale) + " : " + fileLocation + " ; " + e.toString(); Debug.logError(errMsg, module); result.put("errorMessage", errMsg); @@ -193,12 +193,12 @@ try { // JDOM document = sxb.build(new File(fileFullPath)); - } catch(JDOMException e) { + } catch (JDOMException e) { String errMsg = UtilProperties.getMessage(resource, "ImageTransform.errors_occured_during_parsing", locale) + " ImageProperties.xml " + e.toString(); Debug.logError(errMsg, module); result.put("errorMessage", "error"); return result; - } catch(IOException e) { + } catch (IOException e) { String errMsg = UtilProperties.getMessage(resource, "ImageTransform.error_prevents_the document_from_being_fully_parsed", locale) + e.toString(); Debug.logError(errMsg, module); result.put("errorMessage", "error"); @@ -207,7 +207,7 @@ // set Root Element try { rootElt = document.getRootElement(); - } catch(IllegalStateException e) { + } catch (IllegalStateException e) { String errMsg = UtilProperties.getMessage(resource, "ImageTransform.root_element_has_not_been_set", locale) + e.toString(); Debug.logError(errMsg, module); result.put("errorMessage", "error"); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java Fri Mar 6 17:55:43 2009 @@ -87,7 +87,7 @@ GenericValue dateValue = null; try { dateValue = EntityUtil.getFirst(delegator.findByAnd("DateDimension", UtilMisc.toMap("dateValue", currentDate))); - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError(gee.getMessage()); } boolean newValue = (dateValue == null); @@ -117,7 +117,7 @@ } else { dateValue.store(); } - } catch(GenericEntityException gee) { + } catch (GenericEntityException gee) { return ServiceUtil.returnError(gee.getMessage()); } calendar.add(Calendar.DATE, 1); Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java (original) +++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java Fri Mar 6 17:55:43 2009 @@ -71,7 +71,7 @@ this.dataFileStream = dataFileStream; try { this.br = new BufferedReader(new InputStreamReader(dataFileStream, "UTF-8")); - } catch(Exception e) { + } catch (Exception e) { throw new DataFileException("UTF-8 is not supported"); } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java Fri Mar 6 17:55:43 2009 @@ -144,7 +144,7 @@ // Normally, newlyStored = alreadyStored + created TestCase.assertEquals("Created/Stored Nodes", newlyStored, created + alreadyStored); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logInfo(e.getMessage(), module); } } @@ -246,7 +246,7 @@ public void testForeignKeyCreate() throws Exception { try { delegator.create("Testing", "testingId", delegator.getNextSeqId("Testing"), "testingTypeId", "NO-SUCH-KEY"); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logInfo(e.toString(), module); return; } @@ -260,7 +260,7 @@ try { EntityCondition isLevel1 = EntityCondition.makeCondition("description", EntityOperator.EQUALS, "node-level #1"); delegator.removeByCondition("TestingNode", isLevel1); - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logInfo(e.toString(), module); return; } @@ -514,7 +514,7 @@ testingBlob.create(); TestCase.assertTrue("Blob with byte value successfully created...", true); - } catch(Exception ex) { + } catch (Exception ex) { TestCase.fail(ex.getMessage()); } finally { // Remove all our newly inserted values. Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java Fri Mar 6 17:55:43 2009 @@ -352,7 +352,7 @@ numberRead += reader.parse(s); } catch (TemplateException e) { throw new SAXException("Error storing value", e); - } catch(IOException e) { + } catch (IOException e) { throw new SAXException("Error storing value", e); } } Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original) +++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Fri Mar 6 17:55:43 2009 @@ -140,7 +140,7 @@ List<Object> errorMessageList = checkList(context.get("errorMessageList")); errorMessageList.add(errMsg); } - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { throw new RuntimeException(e.getMessage()); } return passed; @@ -283,7 +283,7 @@ String sequenceId = privEnum.getString("sequenceId"); try { privilegeEnumSeq = Integer.parseInt(sequenceId); - } catch(NumberFormatException e) { + } catch (NumberFormatException e) { // just leave it at -1 } } @@ -303,7 +303,7 @@ String sequenceId = privEnum.getString("sequenceId"); try { targetPrivilegeEnumSeq = Integer.parseInt(sequenceId); - } catch(NumberFormatException e) { + } catch (NumberFormatException e) { // just leave it at -1 } if (targetPrivilegeEnumSeq > privilegeEnumSeq) { @@ -1009,7 +1009,7 @@ String sequenceId = privEnum.getString("sequenceId"); try { privilegeEnumSeq = Integer.parseInt(sequenceId); - } catch(NumberFormatException e) { + } catch (NumberFormatException e) { // just leave it at -1 } } @@ -1305,7 +1305,7 @@ } } } - } catch(GenericEntityException e) { + } catch (GenericEntityException e) { Debug.logInfo(e.getMessage() + " Returning false for 'isOwner'.", module); } @@ -1366,7 +1366,7 @@ String sequenceId = privEnum.getString("sequenceId"); try { privilegeEnumSeq = Integer.parseInt(sequenceId); - } catch(NumberFormatException e) { + } catch (NumberFormatException e) { // just leave it at -1 } } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Fri Mar 6 17:55:43 2009 @@ -57,7 +57,7 @@ public static URL getControllerConfigURL(ServletContext context) { try { return context.getResource(controllerXmlFileName); - } catch(MalformedURLException e) { + } catch (MalformedURLException e) { Debug.logError(e, "Error Finding XML Config File: " + controllerXmlFileName, module); return null; } @@ -280,7 +280,7 @@ URL controllerUrl = null; try { controllerUrl = controllerFile.toURL(); - } catch(MalformedURLException mue) { + } catch (MalformedURLException mue) { throw new GeneralException(mue); } ControllerConfig cc = ConfigXMLReader.getControllerConfig(controllerUrl); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java Fri Mar 6 17:55:43 2009 @@ -119,7 +119,7 @@ } return (String) result; - } catch(BSFException e) { + } catch (BSFException e) { throw new EventHandlerException("BSF Error", e); } catch (IOException e) { throw new EventHandlerException("Problems reading script", e); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java Fri Mar 6 17:55:43 2009 @@ -60,7 +60,7 @@ throw new EventHandlerException("Event did not return a String result, it returned a " + result.getClass().getName()); } return (String) result; - } catch(Exception e) { + } catch (Exception e) { throw new EventHandlerException("Groovy Event Error", e); } } Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=751005&r1=751004&r2=751005&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Fri Mar 6 17:55:43 2009 @@ -130,11 +130,11 @@ url = isUrl?FlexibleLocation.resolveLocation(filename):UtilURL.fromFilename(filename); InputStream is = url.openStream(); ins = new InputSource(is); - } catch(MalformedURLException mue) { + } catch (MalformedURLException mue) { return ServiceUtil.returnError("ERROR: invalid file name (" + filename + "): " + mue.getMessage()); - } catch(IOException ioe) { + } catch (IOException ioe) { return ServiceUtil.returnError("ERROR reading file name (" + filename + "): " + ioe.getMessage()); - } catch(Exception exc) { + } catch (Exception exc) { return ServiceUtil.returnError("ERROR: reading file name (" + filename + "): " + exc.getMessage()); } } @@ -155,7 +155,7 @@ FileReader templateReader = null; try { templateReader = new FileReader(fmfilename); - } catch(FileNotFoundException e) { + } catch (FileNotFoundException e) { return ServiceUtil.returnError("ERROR reading template file (" + fmfilename + "): " + e.getMessage()); } @@ -175,7 +175,7 @@ template.process(fmcontext, outWriter); s = outWriter.toString(); - } catch(Exception ex) { + } catch (Exception ex) { return ServiceUtil.returnError("ERROR processing template file (" + fmfilename + "): " + ex.getMessage()); } } @@ -281,7 +281,7 @@ messages.add("Deleting " + f); f.delete(); } - } catch(Exception e) { + } catch (Exception e) { unprocessedFiles.add(f); messages.add("Failed " + f + " adding to retry list for next pass"); } @@ -290,7 +290,7 @@ Debug.log("Pausing for [" + pauseLong + "] seconds - " + UtilDateTime.nowTimestamp()); try { Thread.sleep((pauseLong * 1000)); - } catch(InterruptedException ie) { + } catch (InterruptedException ie) { Debug.log("Pause finished - " + UtilDateTime.nowTimestamp()); } } @@ -486,7 +486,7 @@ ModelReader reader = delegator.getModelReader(); Collection<String> ec = reader.getEntityNames(); passedEntityNames = new TreeSet<String>(ec); - } catch(Exception exc) { + } catch (Exception exc) { return ServiceUtil.returnError("Error retrieving entity names."); } int fileNumber = 1; @@ -533,7 +533,7 @@ if (values != null) { try { values.close(); - } catch(Exception exc) { + } catch (Exception exc) { //Debug.warning(); } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |