OFBiz › OFBiz - Commits

svn commit: r751005 [1/3] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ applications/content...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r751005 [1/3] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ applications/content...

Author: jleroux
Date: Fri Mar 6 17:55:43 2009
New Revision: 751005

URL: http://svn.apache.org/viewvc?rev=751005&view=rev
Log:
catch( => catch(
}else => } else

Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
ofbiz/trunk/framework/bi/src/org/ofbiz/bi/util/DimensionServices.java
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java
ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/GroovyEventHandler.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRendererImage.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapper.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java
ofbiz/trunk/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Mar 6 17:55:43 2009
@@ -127,7 +127,7 @@

return dispatcher.runSync("createInvoiceForOrder", context);
}
- catch(GenericServiceException e) {
+ catch (GenericServiceException e) {
String errMsg = UtilProperties.getMessage(resource,"AccountingEntityDataProblemCreatingInvoiceFromOrderItems",UtilMisc.toMap("reason",e.toString()),(Locale) context.get("locale"));
Debug.logError (e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1339,7 +1339,7 @@
invoiceableShipments = delegator.findList("Shipment", EntityCondition.makeCondition("shipmentId", EntityOperator.IN, invoiceableShipmentIds), null, null, null, false);
}
}
- } catch( GenericEntityException e ) {
+ } catch ( GenericEntityException e ) {
String errMsg = UtilProperties.getMessage(resource, "AccountingTroubleCallingCreateInvoicesFromShipmentsService", locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1395,7 +1395,7 @@
GenericValue destinationContactMech = null;
try {
destinationContactMech = shipment.getRelatedOne("DestinationPostalAddress");
- } catch( GenericEntityException e ) {
+ } catch ( GenericEntityException e ) {
String errMsg = UtilProperties.getMessage(resource, "AccountingTroubleCallingCreateInvoicesFromShipmentService", locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1440,7 +1440,7 @@
}
try {
delegator.storeAll(orderAdjustments);
- } catch( GenericEntityException e ) {
+ } catch ( GenericEntityException e ) {
String errMsg = UtilProperties.getMessage(resource, "AccountingProblemStoringOrderAdjustments", UtilMisc.toMap("orderAdjustments", orderAdjustments), locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1451,7 +1451,7 @@
List orderPaymentPreferences = null;
try {
orderPaymentPreferences = delegator.findByAnd("OrderPaymentPreference", UtilMisc.toMap("orderId", orderId, "paymentMethodTypeId", "CREDIT_CARD"));
- } catch( GenericEntityException e ) {
+ } catch ( GenericEntityException e ) {
String errMsg = UtilProperties.getMessage(resource, "AccountingProblemGettingOrderPaymentPreferences", locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1484,7 +1484,7 @@
Map prefReleaseResult = null;
try {
prefReleaseResult = dispatcher.runSync("releaseOrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreference.getString("orderPaymentPreferenceId"), "userLogin", context.get("userLogin")));
- } catch( GenericServiceException e ) {
+ } catch ( GenericServiceException e ) {
String errMsg = UtilProperties.getMessage(resource, "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -1958,7 +1958,7 @@
GenericValue invoice = null ;
try {
invoice = delegator.findByPrimaryKey("Invoice", UtilMisc.toMap("invoiceId", invoiceId));
- } catch( GenericEntityException e ) {
+ } catch ( GenericEntityException e ) {
Debug.logError(e, "Problem getting Invoice for Invoice ID" + invoiceId, module);
return ServiceUtil.returnError("Problem getting Invoice for Invoice ID" + invoiceId);
}
@@ -2075,7 +2075,7 @@
Map createInvoiceItemResult = null;
try {
createInvoiceItemResult = dispatcher.runSync("createInvoiceItem", createInvoiceItemContext);
- } catch( GenericServiceException e ) {
+ } catch ( GenericServiceException e ) {
String errMsg = UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceItemFromOrder",locale) + ": " + e.toString();
Debug.logError(e, errMsg, module);
ServiceUtil.returnError(errMsg);
@@ -2094,7 +2094,7 @@

try {
Map createOrderAdjustmentBillingResult = dispatcher.runSync("createOrderAdjustmentBilling", createOrderAdjustmentBillingContext);
- } catch( GenericServiceException e ) {
+ } catch ( GenericServiceException e ) {
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingOrderAdjustmentBillingFromOrder",locale), null, null, createOrderAdjustmentBillingContext);
}

@@ -2133,7 +2133,7 @@
Map createInvoiceItemResult = null;
try {
createInvoiceItemResult = dispatcher.runSync("createInvoiceItem", createInvoiceItemContext);
- } catch( GenericServiceException e ) {
+ } catch ( GenericServiceException e ) {
String errMsg = UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceItemFromOrder",locale) + ": " + e.toString();
Debug.logError(e, errMsg, module);
ServiceUtil.returnError(errMsg);
@@ -2152,7 +2152,7 @@

try {
Map createOrderAdjustmentBillingResult = dispatcher.runSync("createOrderAdjustmentBilling", createOrderAdjustmentBillingContext);
- } catch( GenericServiceException e ) {
+ } catch ( GenericServiceException e ) {
ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingOrderAdjustmentBillingFromOrder",locale), null, null, createOrderAdjustmentBillingContext);
}

@@ -2190,7 +2190,7 @@
Map createInvoiceTermResult = null;
try {
createInvoiceTermResult = dispatcher.runSync("createInvoiceTerm", createInvoiceTermContext);
- } catch( GenericServiceException e ) {
+ } catch ( GenericServiceException e ) {
String errMsg = UtilProperties.getMessage(resource,"AccountingServiceErrorCreatingInvoiceTermFromOrder",locale) + ": " + e.toString();
Debug.logError(e, errMsg, module);
ServiceUtil.returnError(errMsg);
@@ -2954,7 +2954,7 @@
List invoicedAdjustments = null;
try {
invoicedAdjustments = delegator.findByAnd("OrderAdjustmentBilling", UtilMisc.toMap("orderAdjustmentId", orderAdjustment.getString("orderAdjustmentId")));
- } catch( GenericEntityException e ) {
+ } catch ( GenericEntityException e ) {
String errMsg = UtilProperties.getMessage(resource, "AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService" + ": " + e.getMessage(), locale);
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Fri Mar 6 17:55:43 2009
@@ -713,7 +713,7 @@
Map releaseResult = null;
try {
releaseResult = dispatcher.runSync("releaseOrderPaymentPreference", releaseContext);
- } catch( GenericServiceException e ) {
+ } catch ( GenericServiceException e ) {
String errMsg = "Problem calling releaseOrderPaymentPreference service for orderPaymentPreferenceId" + paymentPref.getString("orderPaymentPreferenceId");
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -752,7 +752,7 @@
GenericValue paymentPref = null;
try {
paymentPref = delegator.findByPrimaryKey("OrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreferenceId));
- } catch( GenericEntityException e ) {
+ } catch ( GenericEntityException e ) {
String errMsg = "Problem getting OrderPaymentPreference for orderPaymentPreferenceId " + orderPaymentPreferenceId;
Debug.logWarning(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -769,7 +769,7 @@
GenericValue orderHeader = null;
try {
orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", paymentPref.getString("orderId")));
- } catch( GenericEntityException e ) {
+ } catch ( GenericEntityException e ) {
String errMsg = "Problem getting OrderHeader for orderId " + paymentPref.getString("orderId");
Debug.logWarning(e, errMsg, module);
return ServiceUtil.returnError(errMsg);

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Fri Mar 6 17:55:43 2009
@@ -159,7 +159,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to update MWK");
}
@@ -239,7 +239,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to activate gift card");
}
@@ -295,7 +295,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to link gift card(s)");
}
@@ -353,7 +353,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to call disble pin");
}
@@ -417,7 +417,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to redeem gift card");
}
@@ -484,7 +484,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to reload gift card");
}
@@ -542,7 +542,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to call balance inquire");
}
@@ -596,7 +596,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to call history inquire");
}
@@ -661,7 +661,7 @@
Map response = null;
try {
response = vl.send(request);
- } catch(HttpClientException e) {
+ } catch (HttpClientException e) {
Debug.logError(e, "Problem communicating with VL");
return ServiceUtil.returnError("Unable to refund gift card");
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java Fri Mar 6 17:55:43 2009
@@ -77,7 +77,7 @@
allPublishPointList = ContentManagementWorker.getAllPublishPoints(delegator, webSiteId);
permittedPublishPointList = ContentManagementWorker.getPermittedPublishPoints(delegator, allPublishPointList, userLogin, security, "_ADMIN", null, null);
valueList = ContentManagementWorker.getStaticValues(delegator, parentPlaceholderId, permittedPublishPointList);
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
Debug.logError(e.getMessage(), module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
@@ -139,7 +139,7 @@
Map results = dispatcher.runSync("updateContentAssoc", serviceIn);
}
}
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
Debug.logError(e.getMessage(), module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
@@ -201,10 +201,10 @@
// TODO: this needs to be given author userLogin
GenericValue authorUserLogin = delegator.findByPrimaryKeyCache("UserLogin", UtilMisc.toMap("userLoginId", authorId));
origPublishedLinkList = ContentManagementWorker.getPublishedLinks(delegator, targContentId, webSiteId, userLogin, security, permittedAction, permittedOperations, roles );
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
- } catch(GeneralException e2) {
+ } catch (GeneralException e2) {
request.setAttribute("_ERROR_MESSAGE_", e2.getMessage());
return "error";
}
@@ -314,7 +314,7 @@
targContent.set("statusId", "CTNT_PUBLISHED");
targContent.store();
statusIdUpdated = true;
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.getMessage(), module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
@@ -338,11 +338,11 @@
cAssoc.store();
}
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.getMessage(), module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
- } catch(GenericServiceException e2) {
+ } catch (GenericServiceException e2) {
Debug.logError(e2, module);
request.setAttribute("_ERROR_MESSAGE_", e2.getMessage());
return "error";

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java Fri Mar 6 17:55:43 2009
@@ -95,7 +95,7 @@
try {
view = ContentWorker.getSubContentCache( delegator, contentId, mapKey, subContentId, userLogin, assocTypes, fromDate, Boolean.FALSE, null);
content = ContentWorker.getContentFromView(view);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}

@@ -118,7 +118,7 @@

try {
view = ContentWorker.getContentCache( delegator, contentId);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}

@@ -297,7 +297,7 @@
try {
GenericValue val = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId));
if (val == null) contentExists = false;
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}
}
@@ -354,7 +354,7 @@
contentPurpose.create();
}
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}
}
@@ -473,7 +473,7 @@
List siteRoles = null;
try {
siteRoles = delegator.findByAndCache("RoleType", UtilMisc.toMap("parentTypeId", "BLOG"));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError( e.toString());
}

@@ -616,7 +616,7 @@
GenericValue val = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId));
if (val == null)
dataResourceExists = false;
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}
}
@@ -796,7 +796,7 @@
List siteRoles = null;
try {
siteRoles = delegator.findByAndCache("RoleType", UtilMisc.toMap("parentTypeId", "BLOG"));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError( e.toString());
}
Iterator siteRoleIter = siteRoles.iterator();
@@ -960,7 +960,7 @@
}
seqNum += seqIncrement;
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.toString());
}
@@ -1019,7 +1019,7 @@
serviceIn.put("sequenceNum", Long.valueOf(50));
try {
Map thisResult = dispatcher.runSync("persistContentAndAssoc", serviceIn);
- } catch(ServiceAuthException e) {
+ } catch (ServiceAuthException e) {
return ServiceUtil.returnError(e.toString());
}

@@ -1027,7 +1027,7 @@
int leafCount = ContentManagementWorker.updateStatsTopDown(delegator, contentId, typeList);
}

- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.toString());
}
@@ -1047,7 +1047,7 @@
try {
int leafCount = ContentManagementWorker.updateStatsTopDown(delegator, startContentId, typeList);
result.put("leafCount", Integer.valueOf(leafCount));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.toString());
}
@@ -1103,7 +1103,7 @@
}

- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.toString());
}
@@ -1151,7 +1151,7 @@
updatePageNodeChildren(kidContent, context);
}
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.toString());
}
@@ -1198,7 +1198,7 @@
}
}
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.toString());
}
@@ -1335,7 +1335,7 @@
try {
List lst = delegator.findList("ContentAssocDataResourceViewFrom", entityCondList, null, UtilMisc.toList("caSequenceNum", "caFromDate", "createdDate"), null, false);
results.put("_LIST_", lst);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.toString());
}
@@ -1399,7 +1399,7 @@
int changeBranchCount = 1;

ContentManagementWorker.updateStatsBottomUp(delegator, contentId, UtilMisc.toList(contentAssocTypeId), changeBranchCount, changeLeafCount);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}
return result;
@@ -1425,7 +1425,7 @@
int changeBranchCount = -1;

ContentManagementWorker.updateStatsBottomUp(delegator, contentId, UtilMisc.toList(contentAssocTypeId), changeBranchCount, changeLeafCount);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}
return result;
@@ -1446,7 +1446,7 @@

try {
ContentManagementWorker.updateStatsTopDown(delegator, contentId, typeList);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.toString());
}
return result;
@@ -1557,7 +1557,7 @@
} else if (listOrdered.size() > 0) {
productContent = (GenericValue) listOrdered.get(0);
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.toString(), module);
return ServiceUtil.returnError(e.toString());
}
@@ -1622,7 +1622,7 @@
Map thisResult = dispatcher.runSync("updateContentSubscriptionByProduct", ctx);
}
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.toString(), module);
return ServiceUtil.returnError(e.toString());
}
@@ -1656,7 +1656,7 @@

GenericValue content = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId));
result = followNodeChildrenMethod(content, dispatcher, serviceName, ctx);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.toString(), module);
return ServiceUtil.returnError(e.toString());
}
@@ -1708,7 +1708,7 @@
if (UtilValidate.isNotEmpty(oldDataResourceId)) {
try {
dataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", oldDataResourceId));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.toString(), module);
return ServiceUtil.returnError(e.toString());
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Fri Mar 6 17:55:43 2009
@@ -307,7 +307,7 @@
GenericValue currentValue = null;
try {
currentValue = delegator.findOne(currentPK.getEntityName(), currentPK, false);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
}
request.setAttribute("currentValue", currentValue);
}
@@ -364,7 +364,7 @@
//relatedPubPts = delegator.findByAndCache("ContentAssoc", UtilMisc.toMap("contentIdTo", parentPubPt));
relatedPubPts = delegator.findByAndCache("ContentAssoc", UtilMisc.toMap("contentIdTo", parentPubPt, "contentAssocTypeId", "SUBSITE"));

- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
throw new GeneralException(e.getMessage());
}
List allPublishPoints = FastList.newInstance();
@@ -426,7 +426,7 @@
List assocValueList = null;
try {
assocValueList = delegator.findByAndCache("Content", UtilMisc.toMap("contentTypeId", parentPlaceholderId));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
throw new GeneralException(e.getMessage());
}

@@ -596,7 +596,7 @@
try {
List rawAssocValueList = delegator.findByAndCache("ContentAssoc", UtilMisc.toMap("contentId", targContentId, "contentAssocTypeId", "PUBLISH_LINK"));
assocValueList = EntityUtil.filterByDate(rawAssocValueList);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
throw new GeneralException(e.getMessage());
}
Map publishedLinkMap = FastMap.newInstance();
@@ -653,8 +653,8 @@
authorContent.setNonPKFields(value);
//if (Debug.infoOn()) Debug.logInfo("in getAuthorContent, authorContent:" + authorContent, module);
}
- } catch(GenericEntityException e) {
- } catch(MiniLangException e2) {
+ } catch (GenericEntityException e) {
+ } catch (MiniLangException e2) {
}

return authorContent;
@@ -709,7 +709,7 @@
//relatedPubPts = delegator.findByAndCache("ContentAssoc", UtilMisc.toMap("contentIdTo", parentPubPt));
relatedPubPts = delegator.findByAndCache("ContentAssoc", UtilMisc.toMap("contentIdTo", parentPubPt, "contentAssocTypeId", "DEPARTMENT"));

- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
throw new GeneralException(e.getMessage());
}
List allDepartmentPoints = FastList.newInstance();

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java Fri Mar 6 17:55:43 2009
@@ -238,15 +238,15 @@
input.close();
}
return ServiceUtil.returnSuccess(sucMsg);
- } catch(IOException e) {
+ } catch (IOException e) {
errMsg = "IOException "+ UtilMisc.toMap("errMessage", e.toString());
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
errMsg = "GenericServiceException "+ UtilMisc.toMap("errMessage", e.toString());
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
errMsg = "GenericEntityException "+ UtilMisc.toMap("errMessage", e.toString());
Debug.logError(e, errMsg, module);
e.printStackTrace();
@@ -390,12 +390,12 @@

}
return ServiceUtil.returnSuccess(sucMsg);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
errMsg = "GenericEntityException "+ UtilMisc.toMap("errMessage", e.toString());
Debug.logError(e, errMsg, module);
e.printStackTrace();
return ServiceUtil.returnError(errMsg);
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
errMsg = "GenericServiceException"+ UtilMisc.toMap("errMessage", e.toString());
Debug.logError(e, errMsg, module);
e.printStackTrace();

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java Fri Mar 6 17:55:43 2009
@@ -86,7 +86,7 @@
try {
GenericValue val = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId));
if (val == null) contentExists = false;
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, "Error running serviceName persistContentAndAssoc", module);
String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.error_modelservice_for_srv_name", locale);
request.setAttribute("_ERROR_MESSAGE_", "<li>" + errMsg + " [" + "persistContentAndAssoc" + "]: " + e.toString());
@@ -137,7 +137,7 @@
return "error";
}

- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
String errMsg = "Error running serviceName, 'persistContentAndAssoc'. " + e.toString();
Debug.logError(errMsg, module);
request.setAttribute("_ERROR_MESSAGE_", "<li>" + errMsg + "</li>");
@@ -186,13 +186,13 @@
Map results = null;
try {
results = dispatcher.runSync("renderCompDocPdf", mapIn);
- } catch(ServiceAuthException e) {
+ } catch (ServiceAuthException e) {
request.setAttribute("_ERROR_MESSAGE_", e.toString());
return "error";
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.toString());
return "error";
- } catch(Exception e) {
+ } catch (Exception e) {
request.setAttribute("_ERROR_MESSAGE_", e.toString());
return "error";
}
@@ -213,13 +213,13 @@
try {
FileOutputStream fos = new FileOutputStream(FileUtil.getFile("/home/byersa/pdftest.pdf"));
fos.write(outByteBuffer.getBytes());
- } catch(FileNotFoundException e) {
- } catch(IOException e) {
+ } catch (FileNotFoundException e) {
+ } catch (IOException e) {
}
*/
try {
UtilHttp.streamContentToBrowser(response, bais, outByteBuffer.limit(), contentType);
- } catch(IOException e) {
+ } catch (IOException e) {
request.setAttribute("_ERROR_MESSAGE_", e.toString());
return "error";
}
@@ -260,13 +260,13 @@
Map results = null;
try {
results = dispatcher.runSync("renderContentPdf", mapIn);
- } catch(ServiceAuthException e) {
+ } catch (ServiceAuthException e) {
request.setAttribute("_ERROR_MESSAGE_", e.toString());
return "error";
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.toString());
return "error";
- } catch(Exception e) {
+ } catch (Exception e) {
request.setAttribute("_ERROR_MESSAGE_", e.toString());
return "error";
}
@@ -288,13 +288,13 @@
FileOutputStream fos = new FileOutputStream(FileUtil.getFile("/home/byersa/pdftest.pdf"));
fos.write(outByteBuffer.getBytes());
fos.close();
- } catch(FileNotFoundException e) {
- } catch(IOException e) {
+ } catch (FileNotFoundException e) {
+ } catch (IOException e) {
}
*/
try {
UtilHttp.streamContentToBrowser(response, bais, outByteBuffer.limit(), contentType);
- } catch(IOException e) {
+ } catch (IOException e) {
request.setAttribute("_ERROR_MESSAGE_", e.toString());
return "error";
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java Fri Mar 6 17:55:43 2009
@@ -91,7 +91,7 @@
try {
GenericValue val = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId));
if (val == null) contentExists = false;
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, "Error running serviceName persistContentAndAssoc", module);
String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.error_modelservice_for_srv_name", locale);
return ServiceUtil.returnError(errMsg);
@@ -133,7 +133,7 @@

result.putAll(persistRevResult);
return result;
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
String errMsg = "Error running serviceName, 'persistContentAndAssoc'. " + e.toString();
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
@@ -291,7 +291,7 @@
} catch (IOException e) {
Debug.logError(e, "Error in CompDoc operation: ", module);
return ServiceUtil.returnError(e.toString());
- } catch(Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "Error in CompDoc operation: ", module);
return ServiceUtil.returnError(e.toString());
}
@@ -423,7 +423,7 @@
} catch (IOException e) {
Debug.logError(e, "Error in PDF generation: ", module);
return ServiceUtil.returnError(e.toString());
- } catch(Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "Error in PDF generation: ", module);
return ServiceUtil.returnError(e.toString());
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java Fri Mar 6 17:55:43 2009
@@ -123,7 +123,7 @@
if (userLogin != null) {
partyId = userLogin.getString("partyId");
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
ServiceUtil.returnError(e.getMessage());
}
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java Fri Mar 6 17:55:43 2009
@@ -1047,7 +1047,7 @@
try {
content.put("statusId", "CTNT_PUBLISHED");
content.store();
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.getMessage(), module);
return ServiceUtil.returnError(e.getMessage());
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Fri Mar 6 17:55:43 2009
@@ -142,7 +142,7 @@
try {
//relatedAssocs = delegator.findByCondition(viewName, joinExpr,
relatedAssocs = delegator.findList(viewName, assocExprList, null,UtilMisc.toList("caFromDate"), null, false);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.getMessage());
}
for (int i=0; i < relatedAssocs.size(); i++) {
@@ -201,9 +201,9 @@
results = getAssocAndContentAndDataResourceCacheMethod(delegator,
contentId, mapKey, direction, fromDate,
fromDateStr, assocTypes, contentTypes, nullThruDatesOnly, contentAssocPredicateId);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return ServiceUtil.returnError(e.getMessage());
- } catch(MiniLangException e2) {
+ } catch (MiniLangException e2) {
return ServiceUtil.returnError(e2.getMessage());
}
return results;

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Fri Mar 6 17:55:43 2009
@@ -889,7 +889,7 @@
getContentAncestry(delegator, contentAssoc.getString(contentIdOtherField), contentAssocTypeId, direction, contentAncestorList);
contentAncestorList.add(contentAssoc.getString(contentIdOtherField));
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e,module);
return;
}
@@ -927,7 +927,7 @@
}
}
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e,module);
return;
}
@@ -979,7 +979,7 @@

contentAncestorList.add(content);
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e,module);
return;
}
@@ -1249,7 +1249,7 @@
List contentTypeAncestry = FastList.newInstance();
try {
getContentTypeAncestry(delegator, contentTypeId, contentTypeAncestry);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
}
context.put("typeAncestry", contentTypeAncestry);
boolean isReturnBefore = checkReturnWhen(context, (String)whenMap.get("returnBeforePickWhen"));
@@ -1400,7 +1400,7 @@
thisNode.put("mapKey", thisContent.get("caMapKey"));
thisNode.put("fromDate", thisContent.get("caFromDate"));
thisNode.put("contentAssocTypeId", thisContent.get("caContentAssocTypeId"));
- } catch(Exception e) {
+ } catch (Exception e) {
// This ignores the case when thisContent does not have ContentAssoc values
}
return thisNode;
@@ -1439,7 +1439,7 @@
contentId = (String)it.next();
try {
content = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentId));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.getMessage(), module);
return FastList.newInstance();
}
@@ -1467,7 +1467,7 @@
contentId = (String)it.next();
try {
content = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentId));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e.getMessage(), module);
return FastList.newInstance();
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Fri Mar 6 17:55:43 2009
@@ -324,12 +324,12 @@
request.setAttribute("passedParams", passedParams);
//if (Debug.infoOn()) Debug.logInfo("[UploadContentAndImage]newTrail: " + newTrail, module);
TransactionUtil.commit();
- } catch( Exception e) {
+ } catch ( Exception e) {
Debug.logError(e, "[UploadContentAndImage] " , module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
try {
TransactionUtil.rollback();
- } catch(GenericTransactionException e2) {
+ } catch (GenericTransactionException e2) {
request.setAttribute("_ERROR_MESSAGE_", e2.getMessage());
return "error";
}
@@ -402,7 +402,7 @@
if (returnMsg.equals("error")) {
try {
TransactionUtil.rollback();
- } catch(GenericTransactionException e2) {
+ } catch (GenericTransactionException e2) {
ServiceUtil.setMessages(request, e2.getMessage(), null, null);
return "error";
}
@@ -410,12 +410,12 @@
}
}
TransactionUtil.commit();
- } catch( Exception e) {
+ } catch ( Exception e) {
Debug.logError(e, "[UploadContentAndImage] " , module);
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
try {
TransactionUtil.rollback();
- } catch(GenericTransactionException e2) {
+ } catch (GenericTransactionException e2) {
request.setAttribute("_ERROR_MESSAGE_", e2.getMessage());
return "error";
}
@@ -453,7 +453,7 @@
Long sequenceNum = null;
try {
sequenceNum = Long.valueOf((String)objSequenceNum);
- } catch(NumberFormatException e) {}
+ } catch (NumberFormatException e) {}
passedParams.put("caSequenceNum", sequenceNum);
}
}
@@ -483,7 +483,7 @@
ftlContext3 = FastMap.newInstance();
SimpleMapProcessor.runSimpleMapProcessor( "org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", ftlContext2, ftlContext3, errorMessages, loc);
SimpleMapProcessor.runSimpleMapProcessor( "org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", ftlContext3, ftlContext, errorMessages, loc);
- } catch(MiniLangException e) {
+ } catch (MiniLangException e) {
throw new GenericServiceException(e.getMessage());
}

@@ -498,7 +498,7 @@
Map ftlResults = null;
try {
ftlResults = dispatcher.runSync("persistContentAndAssoc", ftlContext);
- } catch(ServiceAuthException e) {
+ } catch (ServiceAuthException e) {
String msg = e.getMessage();
request.setAttribute("_ERROR_MESSAGE_", msg);
List errorMsgList = (List)request.getAttribute("_EVENT_MESSAGE_LIST_");
@@ -539,7 +539,7 @@
resequenceContext.put("userLogin", userLogin);
try {
ftlResults = dispatcher.runSync("resequence", resequenceContext);
- } catch(ServiceAuthException e) {
+ } catch (ServiceAuthException e) {
msg = e.getMessage();
request.setAttribute("_ERROR_MESSAGE_", msg);
List errorMsgList = (List)request.getAttribute("_EVENT_MESSAGE_LIST_");

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Fri Mar 6 17:55:43 2009
@@ -243,7 +243,7 @@
if (returnMsg.equals("error")) {
return "error";
}
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -1160,7 +1160,7 @@
} else {
throw new GeneralException("The dataResourceTypeId [" + dataResourceTypeId + "] is not supported in streamDataResource");
}
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
throw new GeneralException("Error in streamDataResource", e);
}
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java Fri Mar 6 17:55:43 2009
@@ -131,7 +131,7 @@
dataResource.create();
} catch (GenericEntityException e) {
return ServiceUtil.returnError(e.getMessage());
- } catch(Exception e2) {
+ } catch (Exception e2) {
return ServiceUtil.returnError(e2.getMessage());
}
result.put("dataResourceId", dataResourceId);

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Fri Mar 6 17:55:43 2009
@@ -99,7 +99,7 @@
SimpleMapProcessor.runSimpleMapProcessor(
"org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn",
formInput, context, errorMessages, locale);
- } catch(MiniLangException e) {
+ } catch (MiniLangException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -165,7 +165,7 @@
} catch (GenericEntityException e3) {
request.setAttribute("_ERROR_MESSAGE_", e3.getMessage());
return "error";
- } catch( GenericServiceException e) {
+ } catch ( GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -269,7 +269,7 @@
GenericValue dataResourceContentView = (GenericValue)lst.get(0);
contentId = (String)dataResourceContentView.get("coContentId");
}
- } catch( GenericEntityException e) {
+ } catch ( GenericEntityException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -300,7 +300,7 @@

//Debug.logVerbose("in replaceSubContent, context2:" + context2, module);
Map result2 = dispatcher.runSync("deactivateAssocs", context2);
- } catch( GenericServiceException e) {
+ } catch ( GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -377,7 +377,7 @@
newContentAssoc.set("fromDate", UtilDateTime.nowTimestamp());
newContentAssoc.create();
Debug.logVerbose("in cloneLayout, newContentAssoc:" + newContentAssoc, "");
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -396,7 +396,7 @@
String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.no_subcontent", locale);
request.setAttribute("_ERROR_MESSAGE_", errMsg);
}
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -416,10 +416,10 @@
SimpleMapProcessor.runSimpleMapProcessor(
"org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn",
view, serviceIn, errorMessages, locale);
- } catch(IllegalArgumentException e) {
+ } catch (IllegalArgumentException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
- } catch(MiniLangException e) {
+ } catch (MiniLangException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -435,7 +435,7 @@
serviceIn.put("thruDate", null);
try {
results = dispatcher.runSync("persistContentAndAssoc", serviceIn);
- } catch(GenericServiceException e) {
+ } catch (GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -485,7 +485,7 @@
SimpleMapProcessor.runSimpleMapProcessor(
"org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn",
paramMap, context, errorMessages, loc);
- } catch(MiniLangException e) {
+ } catch (MiniLangException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -522,7 +522,7 @@

//Debug.logVerbose("in replaceSubContent, context2:" + context2, module);
Map result2 = dispatcher.runSync("deactivateAssocs", context2);
- } catch( GenericServiceException e) {
+ } catch ( GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -558,7 +558,7 @@
SimpleMapProcessor.runSimpleMapProcessor(
"org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn",
paramMap, context, errorMessages, loc);
- } catch(MiniLangException e) {
+ } catch (MiniLangException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}
@@ -594,7 +594,7 @@
//Debug.logVerbose("in replaceSubContent, context2:" + context2, module);
Map result2 = dispatcher.runSync("deactivateAssocs", context2);
*/
- } catch( GenericServiceException e) {
+ } catch ( GenericServiceException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeByteArrayInputStream.java Fri Mar 6 17:55:43 2009
@@ -60,7 +60,7 @@

try {
close();
- } catch( IOException e) {
+ } catch ( IOException e) {
String errMsg = e.getMessage();
throw new com.sun.star.io.IOException( errMsg, this );
}
@@ -73,7 +73,7 @@
byte [] buf2 = new byte[pos2];
try {
bytesRead = super.read(buf2);
- } catch( IOException e) {
+ } catch ( IOException e) {
String errMsg = e.getMessage();
throw new com.sun.star.io.IOException( errMsg, this );
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java Fri Mar 6 17:55:43 2009
@@ -127,7 +127,7 @@
} catch (IOException e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
- } catch(Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
} finally {
@@ -160,7 +160,7 @@
} catch (IOException e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
- } catch(Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
}
@@ -205,7 +205,7 @@
} catch (IOException e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
- } catch(Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
}
@@ -250,7 +250,7 @@
} catch (IOException e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
- } catch(Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
}
@@ -275,7 +275,7 @@
} catch (IOException e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
- } catch(Exception e) {
+ } catch (Exception e) {
Debug.logError(e, "Error in OpenOffice operation: ", module);
return ServiceUtil.returnError(e.toString());
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeWorker.java Fri Mar 6 17:55:43 2009
@@ -94,7 +94,7 @@

// Create a service manager from the initial object
xmulticomponentfactory = (XMultiComponentFactory) UnoRuntime.queryInterface(XMultiComponentFactory.class, objectInitial);
- } catch(Exception e) {
+ } catch (Exception e) {
// TODO: None of this works. Need a programmable start solution.
//String ooxvfb = UtilProperties.getPropertyValue("openoffice-uno", "oo.start.xvfb");
//String ooexport = UtilProperties.getPropertyValue("openoffice-uno", "oo.start.export");
@@ -123,10 +123,10 @@
factory = getRemoteServer("localhost", "8100");
List filterList = getFilterNames(factory);
request.setAttribute("filterList", filterList);
- } catch(IOException e) {
+ } catch (IOException e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
- } catch(Exception e) {
+ } catch (Exception e) {
request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
return "error";
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/ContentDocument.java Fri Mar 6 17:55:43 2009
@@ -60,7 +60,7 @@
GenericValue content;
try {
content = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId",id));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return doc;
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java Fri Mar 6 17:55:43 2009
@@ -53,7 +53,7 @@
GenericValue dataResource = null;
try {
dataResource = delegator.findByPrimaryKeyCache("DataResource", UtilMisc.toMap("dataResourceId",id));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
Debug.logError(e, module);
return doc;
}
@@ -76,9 +76,9 @@
StringWriter outWriter = new StringWriter();
try {
DataResourceWorker.writeDataResourceText(dataResource, mimeTypeId, locale, context, delegator, outWriter, true);
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
Debug.logError(e, module);
- } catch(IOException e) {
+ } catch (IOException e) {
Debug.logError(e, module);
}
String text = outWriter.toString();

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/search/SearchWorker.java Fri Mar 6 17:55:43 2009
@@ -191,7 +191,7 @@
try {
writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false);
if (Debug.infoOn()) Debug.logInfo("Used old directory:" + indexAllPath, module);
- } catch(FileNotFoundException e) {
+ } catch (FileNotFoundException e) {
writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true);
if (Debug.infoOn()) Debug.logInfo("Created new directory:" + indexAllPath, module);
}
@@ -230,7 +230,7 @@
IndexWriter writer = null;
try {
writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false);
- } catch(FileNotFoundException e) {
+ } catch (FileNotFoundException e) {
writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true);
}
indexDataResource(delegator, context, id, writer);

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java Fri Mar 6 17:55:43 2009
@@ -225,7 +225,7 @@
String errMsg = "Error generating PDF: " + e.toString();
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
} catch (Exception e) {
@@ -302,7 +302,7 @@
String errMsg = "Error generating PDF: " + e.toString();
Debug.logError(e, errMsg, module);
return ServiceUtil.returnError(errMsg);
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
} catch (Exception e) {
@@ -344,13 +344,13 @@
acroFieldMap.put(fieldName, parmValue);
}

- } catch(DocumentException e) {
+ } catch (DocumentException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
System.err.println(ioe.getMessage());
ServiceUtil.returnError(ioe.getMessage());
}
@@ -408,19 +408,19 @@
baos.close();
ByteBuffer outByteBuffer = ByteBuffer.wrap(baos.toByteArray());
results.put("outByteBuffer", outByteBuffer);
- } catch(DocumentException e) {
+ } catch (DocumentException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
- } catch(FileNotFoundException e) {
+ } catch (FileNotFoundException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
- } catch(IOException ioe) {
+ } catch (IOException ioe) {
System.err.println(ioe.getMessage());
ServiceUtil.returnError(ioe.getMessage());
- } catch(Exception ioe) {
+ } catch (Exception ioe) {
System.err.println(ioe.getMessage());
ServiceUtil.returnError(ioe.getMessage());
}
@@ -619,10 +619,10 @@
fos.write(outByteBuffer.array());
fos.close();
}
- } catch(FileNotFoundException e) {
+ } catch (FileNotFoundException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
- } catch(IOException e) {
+ } catch (IOException e) {
System.err.println(e.getMessage());
ServiceUtil.returnError(e.getMessage());
} catch (GenericServiceException e) {
@@ -647,9 +647,9 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
while ((c = fis.read()) != -1) baos.write(c);
inputByteBuffer = ByteBuffer.wrap(baos.toByteArray());
- } catch(FileNotFoundException e) {
+ } catch (FileNotFoundException e) {
throw(new GeneralException(e.getMessage()));
- } catch(IOException e) {
+ } catch (IOException e) {
throw(new GeneralException(e.getMessage()));
}
} else if (UtilValidate.isNotEmpty(contentId)) {

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java Fri Mar 6 17:55:43 2009
@@ -148,11 +148,11 @@
fileName = dataResource.getString("dataResourceName").replace(" ", "_"); // spaces in filenames can be a problem
}
UtilHttp.streamContentToBrowser(response, bais, byteBuffer.limit(), contentType2, fileName);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
throw new ViewHandlerException(e.getMessage());
- } catch(IOException e) {
+ } catch (IOException e) {
throw new ViewHandlerException(e.getMessage());
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
throw new ViewHandlerException(e.getMessage());
}
}

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Fri Mar 6 17:55:43 2009
@@ -112,7 +112,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());
}
final GenericValue view = val;

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Fri Mar 6 17:55:43 2009
@@ -86,7 +86,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());
}
final GenericValue view = val;

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java Fri Mar 6 17:55:43 2009
@@ -86,7 +86,7 @@
GenericValue val = null;
try {
val = FreeMarkerWorker.getCurrentContent(delegator, trail, userLogin, templateRoot, nullThruDatesOnly, contentAssocPredicateId);
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
throw new RuntimeException("Error getting current content. " + e.toString());
}
final GenericValue view = val;

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java Fri Mar 6 17:55:43 2009
@@ -87,7 +87,7 @@
GenericValue val = null;
try {
val = FreeMarkerWorker.getCurrentContent(delegator, trail, userLogin, templateRoot, nullThruDatesOnly, contentAssocPredicateId);
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
throw new RuntimeException("Error getting current content. " + e.toString());
}
final GenericValue view = val;

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java Fri Mar 6 17:55:43 2009
@@ -85,7 +85,7 @@
GenericValue val = null;
try {
val = ContentWorker.getCurrentContent(delegator, trail, userLogin, templateRoot, nullThruDatesOnly, contentAssocPredicateId);
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
throw new RuntimeException("Error getting current content. " + e.toString());
}
final GenericValue view = val;

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Fri Mar 6 17:55:43 2009
@@ -98,7 +98,7 @@
// It may have already been there, but getCurrentContent will compare its contentId
// to values in templateRoot.
val = ContentWorker.getCurrentContent(delegator, globalNodeTrail, userLogin, templateRoot, nullThruDatesOnly, contentAssocPredicateId);
- } catch(GeneralException e) {
+ } catch (GeneralException e) {
throw new RuntimeException("Error getting current content. " + e.toString());
}
final GenericValue view = val;

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=751005&r1=751004&r2=751005&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Fri Mar 6 17:55:43 2009
@@ -174,7 +174,7 @@
if (UtilValidate.isNotEmpty(contentId)) {
try {
content = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId));
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
// TODO: Not sure what to put here.
throw new RuntimeException(e.getMessage());
}
@@ -304,7 +304,7 @@
String contentTypeId = (String)thisContent.get("contentTypeId");
try {
ContentWorker.getContentTypeAncestry(delegator, contentTypeId, contentTypeAncestry);
- } catch(GenericEntityException e) {
+ } catch (GenericEntityException e) {
return false;
}
assocContext.put("typeAncestry", contentTypeAncestry);