[ofbiz-plugins] branch trunk updated: Improved: Change resources with proper naming convention in all plugin components. (OFBIZ-11739) Also, made MODULE as private data member of class instead of public. Thanks Jacques for review.
Locked
 
|
This is an automated email from the ASF dual-hosted git repository.
surajk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git The following commit(s) were added to refs/heads/trunk by this push: new ae31c01 Improved: Change resources with proper naming convention in all plugin components. (OFBIZ-11739) Also, made MODULE as private data member of class instead of public. Thanks Jacques for review. ae31c01 is described below commit ae31c01fa7ee32dc3048dfd3332b0fb208511936 Author: Suraj Khurana <[hidden email]> AuthorDate: Fri May 29 13:14:02 2020 +0530 Improved: Change resources with proper naming convention in all plugin components. (OFBIZ-11739) Also, made MODULE as private data member of class instead of public. Thanks Jacques for review. --- .../ofbiz/assetmaint/FixedAssetMaintServices.java | 14 ++-- .../apache/ofbiz/bi/util/DimensionServices.java | 8 +- .../java/org/apache/ofbiz/birt/BirtWorker.java | 4 +- .../apache/ofbiz/birt/container/BirtContainer.java | 2 +- .../apache/ofbiz/birt/email/BirtEmailServices.java | 32 ++++---- .../birt/flexible/BirtMasterReportServices.java | 8 +- .../apache/ofbiz/birt/flexible/BirtServices.java | 74 +++++++++--------- .../ofbiz/birt/flexible/ReportDesignGenerator.java | 6 +- .../ofbiz/birt/webapp/view/BirtViewHandler.java | 6 +- .../ofbiz/cmssite/multisite/WebSiteFilter.java | 2 +- .../java/org/apache/ofbiz/ebay/EbayHelper.java | 4 +- .../org/apache/ofbiz/ebay/EbayOrderServices.java | 38 ++++----- .../apache/ofbiz/ebay/ImportOrdersFromEbay.java | 44 +++++------ .../apache/ofbiz/ebay/ProductsExportToEbay.java | 20 ++--- .../ofbiz/ebaystore/EbayBestOfferAutoPref.java | 8 +- .../org/apache/ofbiz/ebaystore/EbayEvents.java | 2 +- .../org/apache/ofbiz/ebaystore/EbayFeedback.java | 4 +- .../java/org/apache/ofbiz/ebaystore/EbayStore.java | 36 ++++----- .../ofbiz/ebaystore/EbayStoreAutoPrefEvents.java | 2 +- .../ofbiz/ebaystore/EbayStoreAutoPreferences.java | 14 ++-- .../ofbiz/ebaystore/EbayStoreCategoryFacade.java | 2 +- .../ofbiz/ebaystore/EbayStoreCustomerService.java | 16 ++-- .../apache/ofbiz/ebaystore/EbayStoreHelper.java | 4 +- .../ebaystore/EbayStoreInventoryServices.java | 12 +-- .../org/apache/ofbiz/ebaystore/EbayStoreOrder.java | 24 +++--- .../ofbiz/ebaystore/EbayStoreSiteFacade.java | 2 +- .../ofbiz/ecommerce/janrain/JanrainHelper.java | 2 +- .../ofbiz/ecommerce/misc/ThirdPartyEvents.java | 2 +- .../ecommerce/webapp/view/JspViewHandler.java | 2 +- .../apache/ofbiz/example/ExamplePrintServices.java | 18 ++--- .../org/apache/ofbiz/example/ExampleServices.java | 2 +- .../apache/ofbiz/example/ExampleWebSockets.java | 2 +- .../ofbiz/content/search/DocumentIndexer.java | 2 +- .../apache/ofbiz/content/search/SearchEvents.java | 2 +- .../ofbiz/content/search/SearchServices.java | 6 +- .../apache/ofbiz/content/search/SearchWorker.java | 2 +- .../apache/ofbiz/passport/event/GitHubEvents.java | 20 ++--- .../ofbiz/passport/event/LinkedInEvents.java | 20 ++--- .../ofbiz/passport/user/GitHubAuthenticator.java | 4 +- .../ofbiz/passport/user/LinkedInAuthenticator.java | 4 +- .../apache/ofbiz/passport/util/PassportUtil.java | 2 +- .../ofbiz/htmlreport/AbstractHtmlReport.java | 2 +- .../org/apache/ofbiz/htmlreport/HtmlReport.java | 56 +++++++------- .../ofbiz/htmlreport/sample/SampleHtmlThread.java | 18 ++--- .../apache/ofbiz/pricat/AbstractPricatParser.java | 46 +++++------ .../apache/ofbiz/pricat/InterfacePricatParser.java | 2 +- .../java/org/apache/ofbiz/pricat/PricatEvents.java | 2 +- .../ofbiz/pricat/PricatParseExcelHtmlThread.java | 34 ++++---- .../ofbiz/pricat/sample/SamplePricatEvents.java | 2 +- .../ofbiz/pricat/sample/SamplePricatParser.java | 90 +++++++++++----------- .../apache/ofbiz/pricat/util/OFBizPricatUtil.java | 2 +- .../java/org/apache/ofbiz/project/Various.java | 2 +- .../java/org/apache/ofbiz/scrum/ScrumEvents.java | 2 +- .../java/org/apache/ofbiz/scrum/ScrumServices.java | 10 +-- .../java/org/apache/ofbiz/solr/CategoryUtil.java | 2 +- .../java/org/apache/ofbiz/solr/ProductUtil.java | 2 +- .../org/apache/ofbiz/solr/SolrProductSearch.java | 18 ++--- .../main/java/org/apache/ofbiz/solr/SolrUtil.java | 2 +- .../ofbiz/solr/webapp/OFBizSolrContextFilter.java | 12 +-- .../solr/webapp/OFBizSolrLoadAdminUiServlet.java | 2 +- .../solr/webapp/OFBizSolrRedirectServlet.java | 2 +- .../apache/ofbiz/webpos/search/WebPosSearch.java | 2 +- .../apache/ofbiz/webpos/session/WebPosSession.java | 2 +- .../webpos/transaction/WebPosTransaction.java | 6 +- 64 files changed, 398 insertions(+), 398 deletions(-) diff --git a/assetmaint/src/main/java/org/apache/ofbiz/assetmaint/FixedAssetMaintServices.java b/assetmaint/src/main/java/org/apache/ofbiz/assetmaint/FixedAssetMaintServices.java index 112c3a8..5edad42 100644 --- a/assetmaint/src/main/java/org/apache/ofbiz/assetmaint/FixedAssetMaintServices.java +++ b/assetmaint/src/main/java/org/apache/ofbiz/assetmaint/FixedAssetMaintServices.java @@ -43,8 +43,8 @@ import org.apache.ofbiz.service.ServiceUtil; public class FixedAssetMaintServices { - public static final String MODULE = FixedAssetMaintServices.class.getName(); - public static final String resource = "AssetMaintUiLabels"; + private static final String MODULE = FixedAssetMaintServices.class.getName(); + private static final String RESOURCE = "AssetMaintUiLabels"; public static Map<String, Object> addPartFixedAssetMaint(DispatchContext ctx, Map<String, Object> context) { LocalDispatcher dispatcher = ctx.getDispatcher(); @@ -60,14 +60,14 @@ public class FixedAssetMaintServices { try { GenericValue product = ProductWorker.findProduct(delegator, productId); if (product == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AssetMaintInvalidPartProductIdError", UtilMisc.toMap("productId", productId), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "AssetMaintInvalidPartProductIdError", UtilMisc.toMap("productId", productId), locale)); } Map<String, ? extends Object> findCurrInventoryParams = UtilMisc.toMap("productId", productId, "facilityId", facilityId); GenericValue userLogin = (GenericValue) context.get("userLogin"); // Call issuance service Map<String, Object> result = dispatcher.runSync("getInventoryAvailableByFacility", findCurrInventoryParams); if (ServiceUtil.isError(result)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AssetMaintProblemGettingInventoryLevel", locale) + productId , null, null, result); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "AssetMaintProblemGettingInventoryLevel", locale) + productId , null, null, result); } Object atpObj = result.get("availableToPromiseTotal"); double atp = 0.0; @@ -75,7 +75,7 @@ public class FixedAssetMaintServices { atp = Double.parseDouble(atpObj.toString()); } if (requestedQty > atp) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AssetMaintLowPartInventoryError", UtilMisc.toMap("productId", productId , "quantity", Double.toString(atp)), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "AssetMaintLowPartInventoryError", UtilMisc.toMap("productId", productId , "quantity", Double.toString(atp)), locale)); } EntityConditionList<EntityExpr> ecl = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId), @@ -104,7 +104,7 @@ public class FixedAssetMaintServices { // Call issuance service result = dispatcher.runSync("issueInventoryItemToFixedAssetMaint",itemIssuanceCtx); if (ServiceUtil.isError(result)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AssetMaintProblemCallingService", locale), null, null, result); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "AssetMaintProblemCallingService", locale), null, null, result); } requestedQty = requestedQty - issueQuantity; } @@ -112,7 +112,7 @@ public class FixedAssetMaintServices { Debug.logError("Problem in retriving data from database", MODULE); } catch (GenericServiceException e) { Debug.logError("Problem in calling service issueInventoryItemToFixedAssetMaint", MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AssetMaintProblemCallingService", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "AssetMaintProblemCallingService", locale)); } return ServiceUtil.returnSuccess(); } diff --git a/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java b/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java index 9e2d5f9..38fbf95 100644 --- a/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java +++ b/bi/src/main/java/org/apache/ofbiz/bi/util/DimensionServices.java @@ -41,8 +41,8 @@ import org.apache.ofbiz.service.ServiceUtil; public class DimensionServices { - public static final String MODULE = DimensionServices.class.getName(); - public static final String resource = "BiUiLabels"; + private static final String MODULE = DimensionServices.class.getName(); + private static final String RESOURCE = "BiUiLabels"; public static Map<String, Object> getDimensionIdFromNaturalKey(DispatchContext ctx, Map<String, ? extends Object> context) { Map<String, Object> resultMap = ServiceUtil.returnSuccess(); @@ -75,7 +75,7 @@ public class DimensionServices { andCondition.put(naturalKeyField, dimensionValue.get(naturalKeyField)); } if (andCondition.isEmpty()) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "BusinessIntelligenceNaturalKeyWithourDimension", UtilMisc.toMap("naturalKeyFields", naturalKeyFields, "dimensionValue", dimensionValue), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "BusinessIntelligenceNaturalKeyWithourDimension", UtilMisc.toMap("naturalKeyFields", naturalKeyFields, "dimensionValue", dimensionValue), locale)); } List<GenericValue> existingDimensionValues = null; try { @@ -99,7 +99,7 @@ public class DimensionServices { dimensionValue.set("dimensionId", delegator.getNextSeqId(dimensionValue.getEntityName())); dimensionValue.create(); } else { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "BusinessIntelligenceUpdateModeStillNotSupported", UtilMisc.toMap("updateMode", updateMode), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "BusinessIntelligenceUpdateModeStillNotSupported", UtilMisc.toMap("updateMode", updateMode), locale)); } } } catch (GenericEntityException gee) { diff --git a/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java b/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java index ee7136b..ecca4cd 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java @@ -68,7 +68,7 @@ public final class BirtWorker { private final static String BIRT_IMAGE_DIRECTORY = "birtImageDirectory"; private final static String BIRT_CONTENT_TYPE = "birtContentType"; private final static String BIRT_OUTPUT_FILE_NAME = "birtOutputFileName"; - private static final String resourceError = "BirtErrorUiLabels"; + private static final String RES_ERROR = "BirtErrorUiLabels"; private final static HTMLServerImageHandler imageHandler = new HTMLServerImageHandler(); @@ -234,7 +234,7 @@ public final class BirtWorker { if (!templatePathLocationDir.exists()) { boolean created = templatePathLocationDir.mkdirs(); if (!created) { - throw new GeneralException(UtilProperties.getMessage(resourceError, "BirtErrorCannotLocateReportFolder", locale)); + throw new GeneralException(UtilProperties.getMessage(RES_ERROR, "BirtErrorCannotLocateReportFolder", locale)); } } int i = 0; diff --git a/birt/src/main/java/org/apache/ofbiz/birt/container/BirtContainer.java b/birt/src/main/java/org/apache/ofbiz/birt/container/BirtContainer.java index dc12104..93be95b 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/container/BirtContainer.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/container/BirtContainer.java @@ -36,7 +36,7 @@ import org.apache.ofbiz.birt.BirtWorker; public class BirtContainer implements Container { - public static final String MODULE = BirtContainer.class.getName(); + private static final String MODULE = BirtContainer.class.getName(); protected String configFile; diff --git a/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java b/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java index 1098ee0..24369ce 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java @@ -63,8 +63,8 @@ import freemarker.template.TemplateException; public class BirtEmailServices { - public static final String MODULE = BirtEmailServices.class.getName(); - public static final String resource = "BirtUiLabels"; + private static final String MODULE = BirtEmailServices.class.getName(); + private static final String RESOURCE = "BirtUiLabels"; /** * send birt mail * @@ -119,11 +119,11 @@ public class BirtEmailServices { try { screenStringRenderer = new MacroScreenRenderer("screen", visualTheme.getModelTheme().getScreenRendererLocation("screen")); } catch (TemplateException e) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (IOException e) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } @@ -135,19 +135,19 @@ public class BirtEmailServices { try { screens.render(bodyScreenUri); } catch (GeneralException e) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (IOException e) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorIORenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorIORenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (SAXException e) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorSAXRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorSAXRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (ParserConfigurationException e) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorParserConfigRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorParserConfigRenderingScreenForEmail", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } @@ -201,31 +201,31 @@ public class BirtEmailServices { bodyParts.add(UtilMisc.toMap("content", baos.toByteArray(), "type", "application/pdf", "filename", attachmentName)); serviceContext.put("bodyParts", bodyParts); } catch (GeneralException ge) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", ge.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", ge.toString()), locale); Debug.logError(ge, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (IOException ie) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorIORenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", ie.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorIORenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", ie.toString()), locale); Debug.logError(ie, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (FOPException fe) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorFOPRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", fe.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorFOPRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", fe.toString()), locale); Debug.logError(fe, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (SAXException se) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorSAXRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", se.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorSAXRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", se.toString()), locale); Debug.logError(se, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (ParserConfigurationException pe) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorParserRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", pe.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorParserRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", pe.toString()), locale); Debug.logError(pe, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (EngineException ee) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", ee.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", ee.toString()), locale); Debug.logError(ee, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (SQLException se) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorSQLRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", se.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorSQLRenderingAttachmentForEmail", UtilMisc.toMap("birtContentType", birtContentType, "errorString", se.toString()), locale); Debug.logError(se, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } @@ -270,7 +270,7 @@ public class BirtEmailServices { } } } catch (GenericServiceException e) { - String errMsg = UtilProperties.getMessage(resource, "BirtErrorInSendingEmail", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "BirtErrorInSendingEmail", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } diff --git a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java index 6b56782..4fbfb12 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtMasterReportServices.java @@ -50,9 +50,9 @@ import org.eclipse.birt.report.engine.api.script.IReportContext; public class BirtMasterReportServices { - public static final String MODULE = BirtServices.class.getName(); - public static final String resource = "BirtUiLabels"; - public static final String resource_error = "BirtErrorUiLabels"; + private static final String MODULE = BirtServices.class.getName(); + private static final String RESOURCE = "BirtUiLabels"; + private static final String RES_ERROR = "BirtErrorUiLabels"; // The following methods are flexible report services as examples for reporting public static Map<String, Object> workEffortPerPersonPrepareDate(DispatchContext dctx, Map<String, Object> context) { @@ -363,7 +363,7 @@ public class BirtMasterReportServices { } } catch (Exception e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "BirtErrorRetrievingTurnOver", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "BirtErrorRetrievingTurnOver", locale)); } Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("records", listInvoiceEditable); diff --git a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java index c48f676..67f4d2b 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java @@ -88,10 +88,10 @@ import com.ibm.icu.util.ULocale; public class BirtServices { - public static final String MODULE = BirtServices.class.getName(); - public static final String resource = "BirtUiLabels"; - public static final String resource_error = "BirtErrorUiLabels"; - public static final String resourceProduct = "BirtUiLabels"; + private static final String MODULE = BirtServices.class.getName(); + private static final String RESOURCE = "BirtUiLabels"; + private static final String RES_ERROR = "BirtErrorUiLabels"; + private static final String RES_PRODUCT = "BirtUiLabels"; /** * Instantiate a new Flexible report, using the data given in parameters and <code>ReportDesignGenerator</code> class. @@ -136,16 +136,16 @@ public class BirtServices { try { Map<String, Object> convertRes = dispatcher.runSync("convertFieldTypeToBirtType", UtilMisc.toMap("fieldType", fieldType, "userLogin", userLogin)); if (ServiceUtil.isError(convertRes)) { - String errMsg = UtilProperties.getMessage(resource_error, "BirtErrorConversionFieldToBirtFailed", locale); + String errMsg = UtilProperties.getMessage(RES_ERROR, "BirtErrorConversionFieldToBirtFailed", locale); return ServiceUtil.returnError(errMsg + ServiceUtil.getErrorMessage(convertRes)); } birtType = (String) convertRes.get("birtType"); if (UtilValidate.isEmpty(birtType)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorConversionFieldToBirtFailed", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorConversionFieldToBirtFailed", locale)); } } catch (GenericServiceException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorConversionFieldToBirtFailed", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorConversionFieldToBirtFailed", locale)); } // make more general when report forms have been made so too. if ("date-time".equalsIgnoreCase(birtType) || "date".equalsIgnoreCase(birtType) || "time".equalsIgnoreCase(birtType)) { @@ -178,7 +178,7 @@ public class BirtServices { if (UtilValidate.isEmpty(entityViewName)) { entityViewName = (String) inputFields.get("modelElementName"); if (UtilValidate.isEmpty(entityViewName)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorEntityViewNotFound", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorEntityViewNotFound", locale)); } } @@ -186,22 +186,22 @@ public class BirtServices { resultPerformFind = dispatcher.runSync("performFind", UtilMisc.<String, Object>toMap("entityName", entityViewName, "inputFields", inputFields, "userLogin", userLogin, "noConditionFind", "Y", "locale", locale)); if (ServiceUtil.isError(resultPerformFind)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorRunningPerformFind", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorRunningPerformFind", locale)); } } catch (GenericServiceException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorRunningPerformFind", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorRunningPerformFind", locale)); } try (EntityListIterator listIt = (EntityListIterator) resultPerformFind.get("listIt")) { if (UtilValidate.isNotEmpty(listIt)) { list = listIt.getCompleteList(); } else { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorRunningPerformFind", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorRunningPerformFind", locale)); } } catch (GenericEntityException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorRunningPerformFind", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorRunningPerformFind", locale)); } resultToBirt = ServiceUtil.returnSuccess(); resultToBirt.put("records", list); @@ -233,11 +233,11 @@ public class BirtServices { masterContentAttribute = EntityQuery.use(delegator).from("ContentAttribute").where(entityCondition).queryFirst(); } catch (GenericEntityException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorNoAttributeFound", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorNoAttributeFound", locale)); } if (masterContentAttribute == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorNoAttributeFound", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorNoAttributeFound", locale)); } String attrName = masterContentAttribute.getString("attrName"); String reportContentId; @@ -245,7 +245,7 @@ public class BirtServices { String entityViewName = masterContentAttribute.getString("attrValue"); ModelEntity modelEntity = delegator.getModelEntity(entityViewName); if (modelEntity == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorEntityViewNotExist", locale) + " " + entityViewName); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorEntityViewNotExist", locale) + " " + entityViewName); } try { Map<String, Object> resultContent = dispatcher.runSync("createFlexibleReportFromMasterEntityWorkflow", UtilMisc.toMap("entityViewName", entityViewName, @@ -256,7 +256,7 @@ public class BirtServices { reportContentId = (String) resultContent.get("contentId"); } catch (GenericServiceException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorCannotDetermineDataSource", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorCannotDetermineDataSource", locale)); } } else if ("Service".equalsIgnoreCase(attrName)) { String serviceName = masterContentAttribute.getString("attrValue"); @@ -269,11 +269,11 @@ public class BirtServices { reportContentId = (String) resultContent.get("contentId"); } catch (GenericServiceException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorCannotDetermineDataSource", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorCannotDetermineDataSource", locale)); } } else { // TODO check: could create other workflows. WebService? Does it need to be independent from Service workflow? - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorCannotDetermineDataSource", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorCannotDetermineDataSource", locale)); } // prepare report form to display to allow override @@ -287,10 +287,10 @@ public class BirtServices { textForm = (String) resultFormDisplay.get("textForm"); } catch (GenericServiceException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorCreatingDefaultSearchForm", locale).concat(": ").concat(e.getMessage())); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorCreatingDefaultSearchForm", locale).concat(": ").concat(e.getMessage())); } - Map<String, Object> result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "BirtFlexibleReportSuccessfullyGenerated", locale).concat(" ").concat(reportName)); + Map<String, Object> result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "BirtFlexibleReportSuccessfullyGenerated", locale).concat(" ").concat(reportName)); result.put("textForm", textForm); result.put("reportContentId", reportContentId); return result; @@ -311,7 +311,7 @@ public class BirtServices { // safety check : do not accept "${groovy", "${bsh" and "javascript" String overideFiltersNoWhiteSpace = overrideFilters.replaceAll("\\s", ""); if (overideFiltersNoWhiteSpace.contains("${groovy:") || overideFiltersNoWhiteSpace.contains("${bsh:") || overideFiltersNoWhiteSpace.contains("javascript:")) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorUnauthorisedCharacter", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorUnauthorisedCharacter", locale)); } try { @@ -330,7 +330,7 @@ public class BirtServices { Debug.logError(e, MODULE); return ServiceUtil.returnError("Error in overrideReportForm service."); //TODO labelise } - return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "BirtSearchFormSuccessfullyOverridde", locale)); + return ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "BirtSearchFormSuccessfullyOverridde", locale)); } /** @@ -453,11 +453,11 @@ public class BirtServices { "fieldDisplayLabels", fieldDisplayLabels, "filterDisplayLabels", filterDisplayLabels)); if (ServiceUtil.isError(resultGeneration)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorCreatingFlexibleReport", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorCreatingFlexibleReport", locale)); } } catch (GeneralException e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorCreatingFlexibleReport", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorCreatingFlexibleReport", locale)); } result.put("contentId", contentId); return result; @@ -507,15 +507,15 @@ public class BirtServices { filterMap.put(field.concat("_fld0_op"), "short-varchar"); filterMap.put(field.concat("_fld1_value"), mField.getType()); filterMap.put(field.concat("_fld1_op"), "short-varchar"); - filterDisplayLabels.put(field.concat("_fld0_value"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(resource, "BirtFindFieldOptionValue0", locale))); - filterDisplayLabels.put(field.concat("_fld0_op"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(resource, "BirtFindFieldOptionValue0", locale).concat(UtilProperties.getMessage(resource, "BirtFindCompareOperator", locale)))); - filterDisplayLabels.put(field.concat("_fld1_value"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(resource, "BirtFindFieldOptionValue1", locale))); - filterDisplayLabels.put(field.concat("_fld1_op"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(resource, "BirtFindFieldOptionValue1", locale).concat(UtilProperties.getMessage(resource, "BirtFindCompareOperator", locale)))); + filterDisplayLabels.put(field.concat("_fld0_value"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(RESOURCE, "BirtFindFieldOptionValue0", locale))); + filterDisplayLabels.put(field.concat("_fld0_op"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(RESOURCE, "BirtFindFieldOptionValue0", locale).concat(UtilProperties.getMessage(RESOURCE, "BirtFindCompareOperator", locale)))); + filterDisplayLabels.put(field.concat("_fld1_value"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(RESOURCE, "BirtFindFieldOptionValue1", locale))); + filterDisplayLabels.put(field.concat("_fld1_op"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(RESOURCE, "BirtFindFieldOptionValue1", locale).concat(UtilProperties.getMessage(RESOURCE, "BirtFindCompareOperator", locale)))); } else { // remaining types need 4 fields (fld0-1_op-value) filterMap.put(field, mField.getType()); filterMap.put(field.concat("_op"), "short-varchar"); filterDisplayLabels.put(field, fieldDisplayLabels.get(field)); - filterDisplayLabels.put(field.concat("_op"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(resource, "BirtFindCompareOperator", locale))); + filterDisplayLabels.put(field.concat("_op"), fieldDisplayLabels.get(field).concat(UtilProperties.getMessage(RESOURCE, "BirtFindCompareOperator", locale))); } } Map<String, Object> result = ServiceUtil.returnSuccess(); @@ -582,7 +582,7 @@ public class BirtServices { return ServiceUtil.returnError("Error in deleteAllReports service."); //TODO labelise } if (UtilValidate.isEmpty(listContent)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorNoFlexibleReportToDelete", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorNoFlexibleReportToDelete", locale)); } listContentId = EntityUtil.getFieldListFromEntityList(listContent, "contentId", true); @@ -597,7 +597,7 @@ public class BirtServices { Debug.logError(e, MODULE); return ServiceUtil.returnError("Error in deleteAllReports service."); //TODO labelise } - return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "BirtFlexibleReportsSuccessfullyDeleted", locale)); + return ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "BirtFlexibleReportsSuccessfullyDeleted", locale)); } /** @@ -629,14 +629,14 @@ public class BirtServices { return ServiceUtil.returnError("Error in deleteFlexibleReport service."); //TODO labelise } if (listRptDesignFileGV.size() > 1) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorUnexpectedNumberReportToDelete", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorUnexpectedNumberReportToDelete", locale)); } List<String> listRptDesignFile = EntityUtil.getFieldListFromEntityList(listRptDesignFileGV, "drObjectInfo", false); String rptfileName = listRptDesignFile.get(0); Path path = Paths.get(rptfileName); try { if (!Files.deleteIfExists(path)) { - ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorCannotLocateReportFile", locale)); + ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorCannotLocateReportFile", locale)); } } catch (IOException e) { Debug.logError(e, MODULE); @@ -656,7 +656,7 @@ public class BirtServices { Debug.logError(e, MODULE); return ServiceUtil.returnError("Error in deleteFlexibleReport service."); //TODO labelise } - return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "BirtFlexibleReportSuccessfullyDeleted", locale)); + return ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "BirtFlexibleReportSuccessfullyDeleted", locale)); } /** @@ -686,7 +686,7 @@ public class BirtServices { // get old file to restore dataset and datasource ByteBuffer newRptDesignBytes = (ByteBuffer) context.get("uploadRptDesign"); if (newRptDesignBytes == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorCannotFindUploadedFile", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorCannotFindUploadedFile", locale)); } GenericValue dataResource = null; @@ -747,7 +747,7 @@ public class BirtServices { Files.deleteIfExists(path); } catch (Exception e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, "BirtErrorInuploadRptDesignNoFile", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR, "BirtErrorInuploadRptDesignNoFile", locale)); } //copy cube @@ -858,7 +858,7 @@ public class BirtServices { if (Debug.infoOn()) Debug.logInfo("####### Design uploaded: ".concat(rptDesignName), MODULE); // TODO check: should we, as a secondary safety precaution, delete any file finishing with _TEMP_.rptdesign? - listSuccessMessage.add(UtilProperties.getMessage(resource, "BirtFlexibleRptDesignSuccessfullyUploaded", locale)); + listSuccessMessage.add(UtilProperties.getMessage(RESOURCE, "BirtFlexibleRptDesignSuccessfullyUploaded", locale)); result = ServiceUtil.returnSuccess(listSuccessMessage); return result; } diff --git a/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java b/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java index 832fb7a..b854e28 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/flexible/ReportDesignGenerator.java @@ -81,7 +81,7 @@ public class ReportDesignGenerator { private String rptDesignName; private boolean generateFilters = false; - public static final String resource_error = "BirtErrorUiLabels"; + private static final String RES_ERROR = "BirtErrorUiLabels"; public ReportDesignGenerator(Map<String, Object> context, DispatchContext dctx) throws GeneralException, SemanticException { locale = (Locale) context.get("locale"); @@ -146,7 +146,7 @@ public class ReportDesignGenerator { for (String filter : filterMap.keySet()) { String birtType = BirtUtil.convertFieldTypeToBirtParameterType(filterMap.get(filter)); if (birtType == null) { - throw new GeneralException(UtilProperties.getMessage(resource_error, "BirtErrorConversionFieldToBirtFailed", locale)); + throw new GeneralException(UtilProperties.getMessage(RES_ERROR, "BirtErrorConversionFieldToBirtFailed", locale)); } // get label String displayFilterName; @@ -310,7 +310,7 @@ public class ReportDesignGenerator { resultSetCol.setColumnName(field); String birtType = BirtUtil.convertFieldTypeToBirtType(dataMap.get(field)); if (birtType == null) { - throw new GeneralException(UtilProperties.getMessage(resource_error, "BirtErrorConversionFieldToBirtFailed", locale)); + throw new GeneralException(UtilProperties.getMessage(RES_ERROR, "BirtErrorConversionFieldToBirtFailed", locale)); } resultSetCol.setPosition(i); resultSetCol.setDataType(birtType); diff --git a/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java b/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java index 1b72465..3b2d737 100644 --- a/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java +++ b/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java @@ -51,8 +51,8 @@ import org.xml.sax.SAXException; public class BirtViewHandler implements ViewHandler { - public static final String MODULE = BirtViewHandler.class.getName(); - public static final String resource_error = "BirtErrorUiLabels"; + private static final String MODULE = BirtViewHandler.class.getName(); + private static final String RES_ERROR = "BirtErrorUiLabels"; protected ServletContext servletContext = null; @@ -89,7 +89,7 @@ public class BirtViewHandler implements ViewHandler { } if (UtilValidate.isEmpty(page)) { Locale locale = request.getLocale(); - throw new ViewHandlerException(UtilProperties.getMessage(resource_error, "BirtErrorNotPublishedReport", locale)); + throw new ViewHandlerException(UtilProperties.getMessage(RES_ERROR, "BirtErrorNotPublishedReport", locale)); } if (page.startsWith("component://")) { InputStream reportInputStream = BirtFactory.getReportInputStreamFromLocation(page); diff --git a/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java b/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java index d49c186..5e2bffa 100644 --- a/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java +++ b/cmssite/src/main/java/org/apache/ofbiz/cmssite/multisite/WebSiteFilter.java @@ -51,7 +51,7 @@ import org.apache.ofbiz.webapp.stats.VisitHandler; // Used to filter website on the basis of hosted pathAlias. public class WebSiteFilter implements Filter { - public static final String MODULE = WebSiteFilter.class.getName(); + private static final String MODULE = WebSiteFilter.class.getName(); protected FilterConfig m_config = null; diff --git a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java index 0f0cedc..01ac795 100644 --- a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java +++ b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java @@ -60,7 +60,7 @@ import org.w3c.dom.Element; public class EbayHelper { private static final String configFileName = "ebayExport.properties"; private static final String MODULE = EbayHelper.class.getName(); - public static final String resource = "EbayUiLabels"; + private static final String RESOURCE = "EbayUiLabels"; public static Map<String, Object> buildEbayConfig(Map<String, Object> context, Delegator delegator) { Map<String, Object> buildEbayConfigContext = new HashMap<>(); @@ -71,7 +71,7 @@ public class EbayHelper { try { eBayConfig = EntityQuery.use(delegator).from("EbayConfig").where(UtilMisc.toMap("productStoreId", productStoreId)).queryOne(); } catch (GenericEntityException e) { - String errMsg = UtilProperties.getMessage(resource, "buildEbayConfig.unableToFindEbayConfig" + e.getMessage(), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "buildEbayConfig.unableToFindEbayConfig" + e.getMessage(), locale); return ServiceUtil.returnError(errMsg); } if (eBayConfig != null) { diff --git a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java index 810a046..ae9e1f1 100644 --- a/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java +++ b/ebay/src/main/java/org/apache/ofbiz/ebay/EbayOrderServices.java @@ -57,7 +57,7 @@ import org.w3c.dom.Element; public class EbayOrderServices { - private static final String resource = "EbayUiLabels"; + private static final String RESOURCE = "EbayUiLabels"; private static final String MODULE = EbayOrderServices.class.getName(); private static boolean isGetSellerTransactionsCall = false; private static boolean isGetOrdersCall = false; @@ -79,7 +79,7 @@ public class EbayOrderServices { try { Map<String, Object> eBayConfigResult = EbayHelper.buildEbayConfig(context, delegator); if (UtilValidate.isEmpty(eBayConfigResult)) { - String eBayConfigErrorMsg = UtilProperties.getMessage(resource, "EbayConfigurationSettingsAreMissingForConnectingToEbayServer", locale); + String eBayConfigErrorMsg = UtilProperties.getMessage(RESOURCE, "EbayConfigurationSettingsAreMissingForConnectingToEbayServer", locale); return ServiceUtil.returnError(eBayConfigErrorMsg); } @@ -113,7 +113,7 @@ public class EbayOrderServices { } } } catch (Exception e) { - String errMsg = UtilProperties.getMessage(resource, "buildEbayConfig.exceptionInGetOrdersFromEbay" + e.getMessage(), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "buildEbayConfig.exceptionInGetOrdersFromEbay" + e.getMessage(), locale); return ServiceUtil.returnError(errMsg); } return result; @@ -141,7 +141,7 @@ public class EbayOrderServices { result = createShoppingCart(delegator, dispatcher, locale, context, true); } catch (Exception e) { Debug.logError("Exception in importOrderFromEbay " + e, MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionInImportOrderFromEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionInImportOrderFromEbay", locale)); } if (UtilValidate.isNotEmpty(orderImportSuccessMessageList)) { result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); @@ -183,21 +183,21 @@ public class EbayOrderServices { UtilXml.addChildElementValue(transElem, "CreateTimeFrom", fromDateOut, transDoc); } else { Debug.logError("Cannot convert from date from yyyy-MM-dd HH:mm:ss.SSS date format to yyyy-MM-dd'T'HH:mm:ss.SSS'Z' date format", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.cannotConvertFromDate", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.cannotConvertFromDate", locale)); } fromDateOut = EbayHelper.convertDate(thruDate, "yyyy-MM-dd HH:mm:ss.SSS", "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); if (fromDateOut != null) { UtilXml.addChildElementValue(transElem, "CreateTimeTo", fromDateOut, transDoc); } else { Debug.logError("Cannot convert thru date from yyyy-MM-dd HH:mm:ss.SSS date format to yyyy-MM-dd'T'HH:mm:ss.SSS'Z' date format", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.cannotConvertThruDate", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.cannotConvertThruDate", locale)); } } //Debug.logInfo("The value of generated string is ======= " + UtilXml.writeXmlDocument(transDoc), MODULE); dataItemsXml.append(UtilXml.writeXmlDocument(transDoc)); } catch (Exception e) { Debug.logError("Exception during building get seller transactions request", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionDuringBuildingGetSellerTransactionRequest", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionDuringBuildingGetSellerTransactionRequest", locale)); } return ServiceUtil.returnSuccess(); } @@ -220,7 +220,7 @@ public class EbayOrderServices { UtilXml.addChildElementValue(transElem, "ModTimeFrom", fromDateOut, transDoc); } else { Debug.logError("Cannot convert from date from yyyy-MM-dd HH:mm:ss.SSS date format to yyyy-MM-dd'T'HH:mm:ss.SSS'Z' date format", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.cannotConvertFromDate", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.cannotConvertFromDate", locale)); } fromDateOut = EbayHelper.convertDate(thruDate, "yyyy-MM-dd HH:mm:ss.SSS", "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); @@ -228,13 +228,13 @@ public class EbayOrderServices { UtilXml.addChildElementValue(transElem, "ModTimeTo", fromDateOut, transDoc); } else { Debug.logError("Cannot convert thru date from yyyy-MM-dd HH:mm:ss.SSS date format to yyyy-MM-dd'T'HH:mm:ss.SSS'Z' date format", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.cannotConvertThruDate", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.cannotConvertThruDate", locale)); } //Debug.logInfo("The value of generated string is ======= " + UtilXml.writeXmlDocument(transDoc), MODULE); sellerTransactionsItemsXml.append(UtilXml.writeXmlDocument(transDoc)); } catch (Exception e) { Debug.logError("Exception during building get seller transactions request", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionDuringBuildingGetSellerTransactionRequest", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionDuringBuildingGetSellerTransactionRequest", locale)); } return ServiceUtil.returnSuccess(); } @@ -254,7 +254,7 @@ public class EbayOrderServices { getMyeBaySellingXml.append(UtilXml.writeXmlDocument(transDoc)); } catch (Exception e) { Debug.logError("Exception during building MyeBaySelling request", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionDuringBuildingMyeBaySellingRequest", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionDuringBuildingMyeBaySellingRequest", locale)); } return ServiceUtil.returnSuccess(); } @@ -294,7 +294,7 @@ public class EbayOrderServices { } if (UtilValidate.isEmpty(orderList)) { Debug.logError("No orders found", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.noOrdersFound", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.noOrdersFound", locale)); } if (UtilValidate.isNotEmpty(orderList)) { result.put("orderList", orderList); @@ -989,7 +989,7 @@ public class EbayOrderServices { // Product Store is mandatory if (productStoreId == null) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); } else { GenericValue productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).queryOne(); if (productStore != null) { @@ -997,7 +997,7 @@ public class EbayOrderServices { payToPartyId = productStore.getString("payToPartyId"); facilityId = productStore.getString("inventoryFacilityId"); } else { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); } } @@ -1010,12 +1010,12 @@ public class EbayOrderServices { if (UtilValidate.isNotEmpty(externalId)) { if (externalOrderExists(delegator, externalId) != null && create) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.externalIdAlreadyExist", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.externalIdAlreadyExist", locale)); } cart.setExternalId(externalId); cart.setTransactionId(transactionId); } else { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.externalIdNotAvailable", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.externalIdNotAvailable", locale)); } cart.setOrderType("SALES_ORDER"); @@ -1044,7 +1044,7 @@ public class EbayOrderServices { // Before import the order from eBay to OFBiz is mandatory that the payment has be received String paidTime = (String) context.get("paidTime"); if (UtilValidate.isEmpty(paidTime)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); } List<Map<String, Object>> orderItemList = UtilGenerics.cast(context.get("orderItemList")); @@ -1179,7 +1179,7 @@ public class EbayOrderServices { Debug.logInfo("Creating new postal address for party: " + partyId, MODULE); contactMechId = EbayHelper.createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", shippingAddressCtx); if (UtilValidate.isEmpty(contactMechId)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreUnableToCreatePostalAddress", locale) + shippingAddressCtx); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreUnableToCreatePostalAddress", locale) + shippingAddressCtx); } Debug.logInfo("Created postal address: " + contactMechId, MODULE); Debug.logInfo("Creating new phone number for party: " + partyId, MODULE); @@ -1241,7 +1241,7 @@ public class EbayOrderServices { } } catch (Exception e) { Debug.logError("Exception in createShoppingCart: " + e.getMessage(), MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionInCreateShoppingCart", locale) + ": " + e.getMessage()); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionInCreateShoppingCart", locale) + ": " + e.getMessage()); } return ServiceUtil.returnSuccess(); } diff --git a/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java b/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java index 716a4ed..791e579 100755 --- a/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java +++ b/ebay/src/main/java/org/apache/ofbiz/ebay/ImportOrdersFromEbay.java @@ -53,7 +53,7 @@ import org.w3c.dom.Element; public class ImportOrdersFromEbay { - private static final String resource = "EbayUiLabels"; + private static final String RESOURCE = "EbayUiLabels"; private static final String MODULE = ImportOrdersFromEbay.class.getName(); public static Map<String, Object> importOrdersSearchFromEbay(DispatchContext dctx, Map<String, Object> context) { @@ -74,7 +74,7 @@ public class ImportOrdersFromEbay { } } catch (Exception e) { Debug.logError("Exception in importOrdersSearchFromEbay " + e, MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionInImportOrdersSearchFromEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionInImportOrdersSearchFromEbay", locale)); } return result; @@ -117,7 +117,7 @@ public class ImportOrdersFromEbay { result = createShoppingCart(delegator, dispatcher, locale, order, true); } catch (Exception e) { Debug.logError("Exception in importOrderFromEbay " + e, MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionInImportOrderFromEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionInImportOrderFromEbay", locale)); } return result; @@ -133,7 +133,7 @@ public class ImportOrdersFromEbay { try { if (orderId == null && externalId == null) { Debug.logError("orderId or externalId must be filled", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.orderIdOrExternalIdAreMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.orderIdOrExternalIdAreMandatory", locale)); } GenericValue orderHeader = null; @@ -143,7 +143,7 @@ public class ImportOrdersFromEbay { orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); if (orderHeader == null) { Debug.logError("Cannot find order with orderId [" + orderId + "]", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.errorRetrievingOrderFromOrderId", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.errorRetrievingOrderFromOrderId", locale)); } if (!"EBAY_SALES_CHANNEL".equals(orderHeader.getString("salesChannelEnumId")) || orderHeader.getString("externalId") == null) { @@ -171,12 +171,12 @@ public class ImportOrdersFromEbay { if (successMessage != null) { return readCompleteSaleResponse(successMessage, locale); } else{ - ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.errorDuringPostCompleteSaleRequest", locale)); + ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.errorDuringPostCompleteSaleRequest", locale)); } } } catch (Exception e) { Debug.logError("Exception in setEbayOrderToComplete " + e, MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionInSetEbayOrderToComplete", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionInSetEbayOrderToComplete", locale)); } return ServiceUtil.returnSuccess(); } @@ -189,7 +189,7 @@ public class ImportOrdersFromEbay { return ServiceUtil.returnFailure(errorMessage.toString()); } else if (orders.size() == 0) { Debug.logError("No orders found", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.noOrdersFound", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.noOrdersFound", locale)); } else { Iterator<Map<String, Object>> orderIter = orders.iterator(); while (orderIter.hasNext()) { @@ -229,7 +229,7 @@ public class ImportOrdersFromEbay { UtilXml.addChildElementValue(transElem, "ModTimeFrom", fromDateOut, transDoc); } else { Debug.logError("Cannot convert from date from yyyy-MM-dd HH:mm:ss.SSS date format to yyyy-MM-dd'T'HH:mm:ss.SSS'Z' date format", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.cannotConvertFromDate", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.cannotConvertFromDate", locale)); } @@ -238,13 +238,13 @@ public class ImportOrdersFromEbay { UtilXml.addChildElementValue(transElem, "ModTimeTo", fromDateOut, transDoc); } else { Debug.logError("Cannot convert thru date from yyyy-MM-dd HH:mm:ss.SSS date format to yyyy-MM-dd'T'HH:mm:ss.SSS'Z' date format", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.cannotConvertThruDate", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.cannotConvertThruDate", locale)); } //Debug.logInfo("The value of generated string is ======= " + UtilXml.writeXmlDocument(transDoc), MODULE); dataItemsXml.append(UtilXml.writeXmlDocument(transDoc)); } catch (Exception e) { Debug.logError("Exception during building get seller transactions request", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionDuringBuildingGetSellerTransactionRequest", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionDuringBuildingGetSellerTransactionRequest", locale)); } return ServiceUtil.returnSuccess(); } @@ -255,7 +255,7 @@ public class ImportOrdersFromEbay { try { if (externalId == null) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.errorDuringBuildItemAndTransactionIdFromExternalId", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.errorDuringBuildItemAndTransactionIdFromExternalId", locale)); } Document transDoc = UtilXml.makeEmptyXmlDocument("CompleteSaleRequest"); @@ -308,7 +308,7 @@ public class ImportOrdersFromEbay { dataItemsXml.append(UtilXml.writeXmlDocument(transDoc)); } catch (Exception e) { Debug.logError("Exception during building complete sale request", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionDuringBuildingCompleteSaleRequest", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionDuringBuildingCompleteSaleRequest", locale)); } return ServiceUtil.returnSuccess(); } @@ -597,7 +597,7 @@ public class ImportOrdersFromEbay { // Product Store is mandatory if (productStoreId == null) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); } else { GenericValue productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).queryOne(); if (productStore != null) { @@ -605,7 +605,7 @@ public class ImportOrdersFromEbay { payToPartyId = productStore.getString("payToPartyId"); facilityId = productStore.getString("inventoryFacilityId"); } else { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); } } @@ -617,11 +617,11 @@ public class ImportOrdersFromEbay { if (UtilValidate.isNotEmpty(externalId)) { if (externalOrderExists(delegator, externalId) != null && create) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.externalIdAlreadyExist", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.externalIdAlreadyExist", locale)); } cart.setExternalId(externalId); } else { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.externalIdNotAvailable", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.externalIdNotAvailable", locale)); } cart.setOrderType("SALES_ORDER"); @@ -655,18 +655,18 @@ public class ImportOrdersFromEbay { // check if the producId exists and it is valid String productId = (String) parameters.get("productId"); if (UtilValidate.isEmpty(productId)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productIdNotAvailable", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productIdNotAvailable", locale)); } else { GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne(); if (UtilValidate.isEmpty(product)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productIdDoesNotExist", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productIdDoesNotExist", locale)); } } // Before import the order from eBay to OFBiz is mandatory that the payment has be received String paidTime = (String) parameters.get("paidTime"); if (UtilValidate.isEmpty(paidTime)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); } BigDecimal unitPrice = new BigDecimal((String) parameters.get("transactionPrice")); @@ -759,7 +759,7 @@ public class ImportOrdersFromEbay { Debug.logInfo("Creating new postal address for party: " + partyId, MODULE); contactMechId = EbayHelper.createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", parameters); if (UtilValidate.isEmpty(contactMechId)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayUnableToCreatePostalAddress", locale) + parameters); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayUnableToCreatePostalAddress", locale) + parameters); } Debug.logInfo("Created postal address: " + contactMechId, MODULE); Debug.logInfo("Creating new phone number for party: " + partyId, MODULE); @@ -813,7 +813,7 @@ public class ImportOrdersFromEbay { } } catch (Exception e) { Debug.logError("Exception in createShoppingCart: " + e.getMessage(), MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.exceptionInCreateShoppingCart", locale) + ": " + e.getMessage()); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.exceptionInCreateShoppingCart", locale) + ": " + e.getMessage()); } return ServiceUtil.returnSuccess(); } diff --git a/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java b/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java index 33dcc24..7cd1cca 100755 --- a/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java +++ b/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java @@ -56,7 +56,7 @@ import org.w3c.dom.Node; public class ProductsExportToEbay { - private static final String resource = "EbayUiLabels"; + private static final String RESOURCE = "EbayUiLabels"; private static final String configFileName = "ebayExport.properties"; private static final String MODULE = ProductsExportToEbay.class.getName(); private static List<String> productExportSuccessMessageList = new LinkedList<>(); @@ -100,7 +100,7 @@ public class ProductsExportToEbay { } } catch (Exception e) { Debug.logError("Exception in exportToEbay " + e, MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionInExportToEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionInExportToEbay", locale)); } if (UtilValidate.isNotEmpty(productExportSuccessMessageList)) { result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); @@ -295,7 +295,7 @@ public class ProductsExportToEbay { if (categoryCode.indexOf("_") != -1) { String[] params = categoryCode.split("_"); if (UtilValidate.isEmpty(params) || params[1].length() == 0) { - ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.parametersNotCorrectInGetEbayCategories", locale)); + ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.parametersNotCorrectInGetEbayCategories", locale)); } else { primaryCategoryId = params[1]; } @@ -324,11 +324,11 @@ public class ProductsExportToEbay { dataItemsXml.append(UtilXml.writeXmlDocument(itemDocument)); } catch (Exception e) { Debug.logError("Exception during building data items to eBay: " + e.getMessage(), MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); } } catch (Exception e) { Debug.logError("Exception during building data items to eBay: " + e.getMessage(), MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); } return ServiceUtil.returnSuccess(); } @@ -359,7 +359,7 @@ public class ProductsExportToEbay { dataItemsXml.append(UtilXml.writeXmlDocument(itemRequest)); } catch (Exception e) { Debug.logError("Exception during building data items to eBay", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionDuringBuildingGetCategoriesRequest", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionDuringBuildingGetCategoriesRequest", locale)); } return ServiceUtil.returnSuccess(); } @@ -384,7 +384,7 @@ public class ProductsExportToEbay { setTaxTableRequestXml.append(UtilXml.writeXmlDocument(taxRequestDocument)); } catch (Exception e) { Debug.logError("Exception during building request set tax table to eBay", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionDuringBuildingRequestSetTaxTableToEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionDuringBuildingRequestSetTaxTableToEbay", locale)); } return ServiceUtil.returnSuccess(); } @@ -411,7 +411,7 @@ public class ProductsExportToEbay { Debug.logInfo(dataItemsXml.toString(), MODULE); } catch (Exception e) { Debug.logError("Exception during building AddTransactionConfirmationItemRequest eBay", MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionDuringBuildingAddTransactionConfirmationItemRequestToEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionDuringBuildingAddTransactionConfirmationItemRequestToEbay", locale)); } return ServiceUtil.returnSuccess(); } @@ -520,7 +520,7 @@ public class ProductsExportToEbay { String[] params = categoryCode.split("_"); if (params == null || params.length != 3) { - ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.parametersNotCorrectInGetEbayCategories", locale)); + ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.parametersNotCorrectInGetEbayCategories", locale)); } else { categoryParent = params[1]; levelLimit = params[2]; @@ -541,7 +541,7 @@ public class ProductsExportToEbay { } } catch (Exception e) { Debug.logError("Exception in GetEbayCategories " + e, MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionInGetEbayCategories", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionInGetEbayCategories", locale)); } return result; } diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayBestOfferAutoPref.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayBestOfferAutoPref.java index 99a3474..67ab0c9 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayBestOfferAutoPref.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayBestOfferAutoPref.java @@ -37,8 +37,8 @@ import org.apache.ofbiz.service.ServiceUtil; public class EbayBestOfferAutoPref { - public static final String MODULE = EbayBestOfferAutoPref.class.getName(); - public static final String resource = "EbayStoreUiLabels"; + private static final String MODULE = EbayBestOfferAutoPref.class.getName(); + private static final String RESOURCE = "EbayStoreUiLabels"; public static Map<String, Object> ebayBestOfferPrefCond(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = new HashMap<String, Object>(); @@ -233,11 +233,11 @@ public class EbayBestOfferAutoPref { } } catch (GenericServiceException | GenericEntityException e) { - String errorMessage = UtilProperties.getMessage(resource, "EbayStoreBestOfferToEntityFailed", locale); + String errorMessage = UtilProperties.getMessage(RESOURCE, "EbayStoreBestOfferToEntityFailed", locale); result = ServiceUtil.returnError(errorMessage); return result; } - String successMsg = UtilProperties.getMessage(resource, "EbayStoreBestOfferToEntitySuccessful", locale); + String successMsg = UtilProperties.getMessage(RESOURCE, "EbayStoreBestOfferToEntitySuccessful", locale); result = ServiceUtil.returnSuccess(successMsg); return result; } diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java index 0413b26..43e641f 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java @@ -92,7 +92,7 @@ import com.ebay.soap.eBLBaseComponents.AddItemResponseType; public class EbayEvents { private static final int SHIPPING_SERVICE_ID_LIMIT = 50000; - public static final String MODULE = EbayEvents.class.getName(); + private static final String MODULE = EbayEvents.class.getName(); public static String sendLeaveFeedback(HttpServletRequest request, HttpServletResponse response) { HttpSession session = request.getSession(true); diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayFeedback.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayFeedback.java index b69c0d7..9f4b1bc 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayFeedback.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayFeedback.java @@ -52,7 +52,7 @@ import com.ebay.soap.eBLBaseComponents.TransactionType; public class EbayFeedback { - public static final String resource = "EbayUiLabels"; + private static final String RESOURCE = "EbayUiLabels"; public static Map<String, Object> loadFeedback(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = new HashMap<String, Object>(); @@ -205,7 +205,7 @@ public class EbayFeedback { } catch (Exception e) { result = ServiceUtil.returnError("Exception ".concat(e.getMessage())); } - String successMsg = UtilProperties.getMessage(resource, "EbayLoadEbayFeedbackSuccessful", locale); + String successMsg = UtilProperties.getMessage(RESOURCE, "EbayLoadEbayFeedbackSuccessful", locale); result = ServiceUtil.returnSuccess(successMsg); return result; } diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java index e7caf7b..ff5e37c 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java @@ -153,7 +153,7 @@ import com.ebay.soap.eBLBaseComponents.UserType; import com.ibm.icu.text.SimpleDateFormat; public class EbayStore { - private static final String resource = "EbayStoreUiLabels"; + private static final String RESOURCE = "EbayStoreUiLabels"; private static final String MODULE = ProductsExportToEbay.class.getName(); public static ProductsExportToEbay productExportEbay = new ProductsExportToEbay(); @@ -228,10 +228,10 @@ public class EbayStore { List<GenericValue> catalogCategories = null; if (UtilValidate.isEmpty(context.get("prodCatalogId")) || UtilValidate.isEmpty(context.get("productStoreId")) || UtilValidate.isEmpty(context.get("partyId"))) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreSetCatalogIdAndProductStoreId", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EbayStoreSetCatalogIdAndProductStoreId", locale)); } if (!EbayStoreHelper.validatePartyAndRoleType(delegator,context.get("partyId").toString())) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStorePartyWithoutRoleEbayAccount", UtilMisc.toMap("partyId", context.get("partyId").toString()), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EbayStorePartyWithoutRoleEbayAccount", UtilMisc.toMap("partyId", context.get("partyId").toString()), locale)); } try { SetStoreCategoriesCall call = new SetStoreCategoriesCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"), locale, delegator)); @@ -357,7 +357,7 @@ public class EbayStore { } } } else { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreRootCategoryNotFound", UtilMisc.toMap("prodCatalogId", context.get("prodCatalogId")), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EbayStoreRootCategoryNotFound", UtilMisc.toMap("prodCatalogId", context.get("prodCatalogId")), locale)); } } catch (GenericEntityException e) { result = ServiceUtil.returnError(e.getMessage()); @@ -407,9 +407,9 @@ public class EbayStore { } } } - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayExportToEbayStoreSuccess", locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayExportToEbayStoreSuccess", locale)); } else { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayExportToEbayStoreFailed", UtilMisc.toMap("errorString", resp.getMessage()), locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EbayExportToEbayStoreFailed", UtilMisc.toMap("errorString", resp.getMessage()), locale)); } } } catch (ApiException e) { @@ -453,7 +453,7 @@ public class EbayStore { } catch (Exception e) { Debug.logError("Exception during building data items to eBay: " + e.getMessage(), MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); } return ServiceUtil.returnSuccess(); } @@ -497,7 +497,7 @@ public class EbayStore { dataStoreXml.append(UtilXml.writeXmlDocument(storeDocument)); } catch (Exception e) { Debug.logError("Exception during building data to eBay: " + e.getMessage(), MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); } return ServiceUtil.returnSuccess(); } @@ -533,7 +533,7 @@ public class EbayStore { } catch (Exception e) { Debug.logError("Exception during building data to eBay: " + e.getMessage(), MODULE); - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "productsExportToEbay.exceptionDuringBuildingDataItemsToEbay", locale)); } return ServiceUtil.returnSuccess(); } @@ -647,7 +647,7 @@ public class EbayStore { if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { returnedStoreType = resp.getStore(); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); - //result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "EbayStoreLoadSuccess", locale)); + //result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(RESOURCE, "EbayStoreLoadSuccess", locale)); // update product store in ofbiz updateProductStore(dctx, context, returnedStoreType,(String) context.get("productStoreId")); Map<String,Object> ebayResp = new HashMap<String, Object>(); @@ -963,7 +963,7 @@ public class EbayStore { logoList.add(logo); i++; } - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreLoadLogoSuccess", locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreLoadLogoSuccess", locale)); result.put("storeLogoOptList", logoList); } else { EbayStoreHelper.createErrorLogMessage(userLogin, dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrievePredesignedLogoOption", resp.getErrors(0).getLongMessage()); @@ -1015,7 +1015,7 @@ public class EbayStore { themeList.add(basictheme); i++; } - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreLoadBasicThemeSuccess", locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreLoadBasicThemeSuccess", locale)); result.put("storeThemeList", themeList); } else { EbayStoreHelper.createErrorLogMessage(userLogin, dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrieveBasicThemeArray", resp.getErrors(0).getLongMessage()); @@ -1047,7 +1047,7 @@ public class EbayStore { resp = (GetStoreOptionsResponseType) call.execute(req); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreLoadAdvancedThemeSuccess", locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreLoadAdvancedThemeSuccess", locale)); returnedAdvancedThemeArray = resp.getAdvancedThemeArray(); @@ -1201,7 +1201,7 @@ public class EbayStore { advanceFontTheme.put("storeDescSizeList",descSizes); i++; } - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreLoadBasicThemeSuccess", locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreLoadBasicThemeSuccess", locale)); result.put("advanceFontTheme", advanceFontTheme); } else { EbayStoreHelper.createErrorLogMessage(userLogin, dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "Get store option : retrieveStoreFontTheme", resp.getErrors(0).getLongMessage()); @@ -1311,7 +1311,7 @@ public class EbayStore { resp = (SetStoreResponseType) call.execute(req); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreSaveSuccess",locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreSaveSuccess",locale)); } else { result = ServiceUtil.returnError(resp.getMessage()); } @@ -1837,7 +1837,7 @@ public class EbayStore { } catch (Exception e) { return ServiceUtil.returnError(e.getMessage()); } - return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreAddSecondChanceOfferSuccessful", locale)); + return ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreAddSecondChanceOfferSuccessful", locale)); } @SuppressWarnings("serial") @@ -2290,7 +2290,7 @@ public class EbayStore { } catch (Exception e) { return ServiceUtil.returnError(e.getMessage()); } - return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreUpdateItemSuccessfully", locale)); + return ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreUpdateItemSuccessfully", locale)); } public Map<String, Object> geteBayClosedItem(DispatchContext dctx, Map<String, ? extends Object> context) { Map <String, Object> result = new HashMap<String, Object>(); @@ -2413,7 +2413,7 @@ public class EbayStore { public static Map<String, Object> getShippingDetail(AddressType shippingAddress, Locale locale) { if(UtilValidate.isEmpty(shippingAddress)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreRequiredShippingAddressParameter", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EbayStoreRequiredShippingAddressParameter", locale)); } Map<String, Object> result = new HashMap<String, Object>(); String buyerName = null; diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java index 4fbade7..4e5ea12 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java @@ -33,7 +33,7 @@ import org.apache.ofbiz.service.LocalDispatcher; public class EbayStoreAutoPrefEvents{ - public static final String MODULE = EbayStoreAutoPrefEvents.class.getName(); + private static final String MODULE = EbayStoreAutoPrefEvents.class.getName(); public static String ebayAutoPrefCond (HttpServletRequest request, HttpServletResponse response) { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java index 5615298..bc2a5ea 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreAutoPreferences.java @@ -118,7 +118,7 @@ import com.ebay.soap.eBLBaseComponents.UserType; public class EbayStoreAutoPreferences { public static String MODULE = EbayStoreAutoPreferences.class.getName(); - private static final String resource = "EbayStoreUiLabels"; + private static final String RESOURCE = "EbayStoreUiLabels"; public EbayStoreAutoPreferences() { @@ -131,7 +131,7 @@ public class EbayStoreAutoPreferences { Locale locale = (Locale) context.get("locale"); if (UtilValidate.isEmpty(context.get("productStoreId")) && UtilValidate.isEmpty(context.get("jobId"))) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredProductStoreId", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreRequiredProductStoreId", locale)); } String jobId = (String) context.get("jobId"); String productStoreId = (String) context.get("productStoreId"); @@ -214,7 +214,7 @@ public class EbayStoreAutoPreferences { } catch (GenericEntityException gee) { return ServiceUtil.returnError(gee.getMessage()); } catch (Exception e) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreProblemConnectingToEbaySite", locale) + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreProblemConnectingToEbaySite", locale) + e); } return ServiceUtil.returnSuccess(); @@ -318,7 +318,7 @@ public class EbayStoreAutoPreferences { Locale locale = (Locale) context.get("locale"); GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne(); if (UtilValidate.isEmpty(context.get("productStoreId")) && UtilValidate.isEmpty(context.get("jobId"))) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredProductStoreId", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreRequiredProductStoreId", locale)); } String jobId = (String) context.get("jobId"); String productStoreId = (String) context.get("productStoreId"); @@ -395,7 +395,7 @@ public class EbayStoreAutoPreferences { } } } catch (Exception e) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreProblemConnectingToEbaySite", locale) + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreProblemConnectingToEbaySite", locale) + e); } return ServiceUtil.returnSuccess(); @@ -692,7 +692,7 @@ public class EbayStoreAutoPreferences { GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne(); if (UtilValidate.isEmpty(context.get("productStoreId")) && UtilValidate.isEmpty(context.get("jobId"))) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredProductStoreId", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreRequiredProductStoreId", locale)); } String jobId = (String) context.get("jobId"); @@ -755,7 +755,7 @@ public class EbayStoreAutoPreferences { } } } catch (Exception e) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreProblemConnectingToEbaySite", locale) + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreProblemConnectingToEbaySite", locale) + e); } return ServiceUtil.returnSuccess(); diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java index 9d1a473..1dbfdee 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java @@ -55,7 +55,7 @@ import com.ebay.soap.eBLBaseComponents.StoreOwnerExtendedListingDurationsType; import com.ebay.soap.eBLBaseComponents.ThemeGroupType; public class EbayStoreCategoryFacade { - public static final String MODULE = EbayStoreCategoryFacade.class.getName(); + private static final String MODULE = EbayStoreCategoryFacade.class.getName(); private ApiContext apiContext = null; private String catId = null; private IAttributesMaster attrMaster = null; diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCustomerService.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCustomerService.java index b551808..439433f 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCustomerService.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCustomerService.java @@ -44,13 +44,13 @@ import com.ebay.soap.eBLBaseComponents.UserType; public class EbayStoreCustomerService { public static String MODULE = EbayStoreCustomerService.class.getName(); - private static final String resource = "EbayStoreUiLabels"; + private static final String RESOURCE = "EbayStoreUiLabels"; public static Map<String, Object> listBestOfferIncludeMessage(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); if (UtilValidate.isEmpty(context.get("userId")) || UtilValidate.isEmpty(context.get("itemId"))) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredUserIdAndItemId", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreRequiredUserIdAndItemId", locale)); } Map <String, Object> result = new HashMap<String, Object>(); try { @@ -92,7 +92,7 @@ public class EbayStoreCustomerService { result.put("offerStatus", offerStatus); result.put("itemName", itemName); } catch (Exception e) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreErrorFromListBestOfferIncludeMessage", locale) + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreErrorFromListBestOfferIncludeMessage", locale) + e); } return result; } @@ -100,7 +100,7 @@ public class EbayStoreCustomerService { Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); if (UtilValidate.isEmpty(context.get("productStoreId")) || UtilValidate.isEmpty(context.get("userId")) || UtilValidate.isEmpty(context.get("itemId")) || UtilValidate.isEmpty(context.get("offerId")) || UtilValidate.isEmpty(context.get("contactSetting"))) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredUserIdAndItemIdAndProductStoreIdAndOfferIdAndContactStatus", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreRequiredUserIdAndItemIdAndProductStoreIdAndOfferIdAndContactStatus", locale)); } String userId = (String) context.get("userId"); String itemId = (String) context.get("itemId"); @@ -127,7 +127,7 @@ public class EbayStoreCustomerService { respondToBestOfferCall.respondToBestOffer(); contactStatus = "FINISHED"; } else { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredContactStatusSetting", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreRequiredContactStatusSetting", locale)); } GenericValue ebayUserBestOffer = EntityQuery.use(delegator).from("EbayUserBestOffer").where("userId", userId, "itemId", itemId).queryOne(); ebayUserBestOffer.set("contactStatus", contactStatus); @@ -145,7 +145,7 @@ public class EbayStoreCustomerService { } catch (GenericEntityException e) { return ServiceUtil.returnError(e.getMessage()); } catch (Exception e) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreErrorFromUpdateContactStatus", locale) + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreErrorFromUpdateContactStatus", locale) + e); } return result; } @@ -156,7 +156,7 @@ public class EbayStoreCustomerService { Locale locale = (Locale) context.get("locale"); Map <String, Object> result = new HashMap<String, Object>(); if (UtilValidate.isEmpty(context.get("itemId")) || UtilValidate.isEmpty(context.get("userId"))) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreRequiredUserIdAndItemId", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreRequiredUserIdAndItemId", locale)); } String itemId = (String) context.get("itemId"); String userId = (String) context.get("userId"); @@ -167,7 +167,7 @@ public class EbayStoreCustomerService { } catch (GenericEntityException e) { return ServiceUtil.returnError(e.getMessage()); } catch (Exception e) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreErrorFromDeleteContactStatus", locale) + e); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreErrorFromDeleteContactStatus", locale) + e); } return result; } diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java index 008811a..81b5bb9 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java @@ -92,7 +92,7 @@ import com.ibm.icu.text.SimpleDateFormat; public class EbayStoreHelper { private static final String MODULE = EbayStoreHelper.class.getName(); - public static final String resource = "EbayStoreUiLabels"; + private static final String RESOURCE = "EbayStoreUiLabels"; public static ApiContext getApiContext(String productStoreId,Locale locale, Delegator delegator) { Map<String, Object> context = new HashMap<String, Object>(); @@ -287,7 +287,7 @@ public class EbayStoreHelper { } if (UtilValidate.isEmpty(ebayProductPref.getString("autoPrefJobId"))) { if (UtilValidate.isEmpty(serviceName)) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreAutoPrefJobEmpty", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EbayStoreAutoPrefJobEmpty", locale)); } /*** RuntimeData ***/ String runtimeDataId = null; diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java index 2900ce2..d8c1984 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreInventoryServices.java @@ -61,7 +61,7 @@ import com.ebay.soap.eBLBaseComponents.SellingManagerProductType; public class EbayStoreInventoryServices { private static final String MODULE = EbayStoreInventoryServices.class.getName(); - public static final String resource = "EbayStoreUiLabels"; + private static final String RESOURCE = "EbayStoreUiLabels"; private static final String defaultFolderName = "OFBizProducts"; private static String folderId = null; public EbayStoreInventoryServices() { @@ -79,7 +79,7 @@ public class EbayStoreInventoryServices { boolean status = false; try { if (context.get("productStoreId") == null || context.get("productId") == null || context.get("folderId") == null) { - result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreInventoryFolderIdRequired", locale)); + result = ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EbayStoreInventoryFolderIdRequired", locale)); result.put("productStoreId", context.get("productStoreId")); result.put("facilityId", context.get("facilityId")); result.put("folderId", context.get("folderId")); @@ -116,9 +116,9 @@ public class EbayStoreInventoryServices { } if (status) { Debug.logInfo("Done to updated product ".concat(context.get("productId").toString()), MODULE); - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreInventoryFolderIdUpdated", UtilMisc.toMap("folderId", context.get("folderId")), locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreInventoryFolderIdUpdated", UtilMisc.toMap("folderId", context.get("folderId")), locale)); } else { - result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "EbayStoreInventoryFolderIdUpdatedFailed", locale)); + result = ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "EbayStoreInventoryFolderIdUpdatedFailed", locale)); } } }catch (ApiException e) { @@ -273,7 +273,7 @@ public class EbayStoreInventoryServices { } else { EbayStoreHelper.createErrorLogMessage(userLogin, dctx.getDispatcher(), context.get("productStoreId").toString(), resp.getAck().toString(), "GetSellingManagerInventoryFolderCall : getFolderInEbayStoreInventory", resp.getErrors(0).getLongMessage()); } - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreInventoryFolderIdLoaded", UtilMisc.toMap("folderId", folderId), locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreInventoryFolderIdLoaded", UtilMisc.toMap("folderId", folderId), locale)); } } catch (ApiException e) { result = ServiceUtil.returnFailure(e.getMessage()); @@ -355,7 +355,7 @@ public class EbayStoreInventoryServices { ebayProductStoreInventory.put("sold",new BigDecimal(prodInventoryStatus.getQuantitySold())); ebayProductStoreInventory.put("unSold",new BigDecimal(prodInventoryStatus.getQuantityUnsold())); ebayProductStoreInventory.store(); - result = ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "EbayStoreInventoryStatusUpdated", UtilMisc.toMap("productId", productId), locale)); + result = ServiceUtil.returnSuccess(UtilProperties.getMessage(RESOURCE, "EbayStoreInventoryStatusUpdated", UtilMisc.toMap("productId", productId), locale)); break; } } diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java index a8a0a07..981680c 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java @@ -53,7 +53,7 @@ import org.apache.ofbiz.service.ServiceUtil; public class EbayStoreOrder { - private static final String resource = "EbayUiLabels"; + private static final String RESOURCE = "EbayUiLabels"; private static final String MODULE = EbayStoreOrder.class.getName(); public static Map<String, Object> EbayStoreImportTransaction(DispatchContext dctx, Map<String, Object> context) { @@ -108,7 +108,7 @@ public class EbayStoreOrder { try { if (UtilValidate.isEmpty(productStoreId)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); } else { GenericValue productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).queryOne(); if (productStore != null) { @@ -116,7 +116,7 @@ public class EbayStoreOrder { payToPartyId = productStore.getString("payToPartyId"); facilityId = productStore.getString("inventoryFacilityId"); } else { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); } } @@ -125,7 +125,7 @@ public class EbayStoreOrder { if (UtilValidate.isNotEmpty(externalId)) { cart.setExternalId(externalId); } else { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreOrder.externalIdNotAvailable", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreOrder.externalIdNotAvailable", locale)); } cart.setOrderType("SALES_ORDER"); @@ -154,16 +154,16 @@ public class EbayStoreOrder { String productId = context.get("productId").toString(); if (UtilValidate.isEmpty(productId)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productIdNotAvailable", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productIdNotAvailable", locale)); } else { GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne(); if (UtilValidate.isEmpty(product)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productIdDoesNotExist", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productIdDoesNotExist", locale)); } } if (UtilValidate.isEmpty(context.get("paidTime"))) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); } BigDecimal unitPrice = new BigDecimal(context.get("transactionPrice").toString()); @@ -250,7 +250,7 @@ public class EbayStoreOrder { Debug.logInfo("Creating new postal address for party: " + partyId, MODULE); contactMechId = EbayHelper.createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", context); if (UtilValidate.isEmpty(contactMechId)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreUnableToCreatePostalAddress", locale) + context); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreUnableToCreatePostalAddress", locale) + context); } Debug.logInfo("Created postal address: " + contactMechId, MODULE); Debug.logInfo("Creating new phone number for party: " + partyId, MODULE); @@ -319,7 +319,7 @@ public class EbayStoreOrder { String facilityId = null; try { if (productStoreId == null) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); } else { GenericValue productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).queryOne(); if (productStore != null) { @@ -327,7 +327,7 @@ public class EbayStoreOrder { payToPartyId = productStore.getString("payToPartyId"); facilityId = productStore.getString("inventoryFacilityId"); } else { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.productStoreIdIsMandatory", locale)); } } ShoppingCart cart = new ShoppingCart(delegator, productStoreId, locale, defaultCurrencyUomId); @@ -360,7 +360,7 @@ public class EbayStoreOrder { // Before import the order from eBay to OFBiz is mandatory that the payment has be received String paidTime = (String) context.get("paidTime"); if (UtilValidate.isEmpty(paidTime)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "ordersImportFromEbay.paymentIsStillNotReceived", locale)); } List<Map<String, Object>> orderItemList = UtilGenerics.checkList(context.get("orderItemList")); @@ -484,7 +484,7 @@ public class EbayStoreOrder { Debug.logInfo("Creating new postal address for party: " + partyId, MODULE); contactMechId = EbayHelper.createAddress(dispatcher, partyId, userLogin, "SHIPPING_LOCATION", shippingAddressCtx); if (UtilValidate.isEmpty(contactMechId)) { - return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "EbayStoreUnableToCreatePostalAddress", locale) + shippingAddressCtx); + return ServiceUtil.returnFailure(UtilProperties.getMessage(RESOURCE, "EbayStoreUnableToCreatePostalAddress", locale) + shippingAddressCtx); } Debug.logInfo("Created postal address: " + contactMechId, MODULE); Debug.logInfo("Creating new phone number for party: " + partyId, MODULE); diff --git a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreSiteFacade.java b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreSiteFacade.java index f1d7192..eabad9c 100644 --- a/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreSiteFacade.java +++ b/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreSiteFacade.java @@ -52,7 +52,7 @@ import com.ebay.soap.eBLBaseComponents.StoreCustomCategoryType; import com.ebay.soap.eBLBaseComponents.StoreType; public class EbayStoreSiteFacade { - public static final String MODULE = EbayStoreSiteFacade.class.getName(); + private static final String MODULE = EbayStoreSiteFacade.class.getName(); private ApiContext apiContext = null; private IAttributesMaster attrMaster = null; private static final int MAP_SIZE = 30000; diff --git a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java index a2355a1..0615b63 100644 --- a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java +++ b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/janrain/JanrainHelper.java @@ -61,7 +61,7 @@ import org.xml.sax.SAXException; */ public class JanrainHelper { - public static final String MODULE = JanrainHelper.class.getName(); + private static final String MODULE = JanrainHelper.class.getName(); private static String apiKey = UtilProperties.getPropertyValue("ecommerce", "janrain.apiKey"); private static String baseUrl = UtilProperties.getPropertyValue("ecommerce", "janrain.baseUrl"); public JanrainHelper(String apiKey, String baseUrl) { diff --git a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/misc/ThirdPartyEvents.java b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/misc/ThirdPartyEvents.java index 67aa485..befc689 100644 --- a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/misc/ThirdPartyEvents.java +++ b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/misc/ThirdPartyEvents.java @@ -39,7 +39,7 @@ import org.apache.ofbiz.entity.util.EntityUtil; public class ThirdPartyEvents { - public static final String MODULE = ThirdPartyEvents.class.getName(); + private static final String MODULE = ThirdPartyEvents.class.getName(); public final static String DISTRIBUTOR_ID = "_DISTRIBUTOR_ID_"; public final static String AFFILIATE_ID = "_AFFILIATE_ID_"; diff --git a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java index d8b4289..f187d50 100644 --- a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java +++ b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java @@ -39,7 +39,7 @@ import org.apache.ofbiz.webapp.view.ViewHandlerException; */ public class JspViewHandler extends AbstractViewHandler { - public static final String MODULE = JspViewHandler.class.getName(); + private static final String MODULE = JspViewHandler.class.getName(); protected ServletContext context; diff --git a/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java b/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java index 81b7440..87d984a 100644 --- a/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java +++ b/example/src/main/java/org/apache/ofbiz/example/ExamplePrintServices.java @@ -61,8 +61,8 @@ import org.xml.sax.SAXException; import freemarker.template.TemplateException; public class ExamplePrintServices { - public static final String MODULE = ExamplePrintServices.class.getName(); - public static final String resource = "ExampleUiLabels"; + private static final String MODULE = ExamplePrintServices.class.getName(); + private static final String RESOURCE = "ExampleUiLabels"; public static Map<String, Object> printReportPdf(DispatchContext dctx, Map<String, ? extends Object> context) { Locale locale = (Locale)context.get("locale"); @@ -82,11 +82,11 @@ public class ExamplePrintServices { try { screenStringRenderer = new MacroScreenRenderer("screen", visualTheme.getModelTheme().getScreenRendererLocation("screen")); } catch (TemplateException e) { - String errMsg = UtilProperties.getMessage(resource, "ExampleGeneralErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "ExampleGeneralErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (IOException e) { - String errMsg = UtilProperties.getMessage(resource, "ExampleIOErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "ExampleIOErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } @@ -100,19 +100,19 @@ public class ExamplePrintServices { try { reportScreenRenderer.render(screenLocation, reportScreenName); } catch (GeneralException e) { - String errMsg = UtilProperties.getMessage(resource, "ExampleGeneralErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "ExampleGeneralErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (IOException e) { - String errMsg = UtilProperties.getMessage(resource, "ExampleIOErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "ExampleIOErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (SAXException e) { - String errMsg = UtilProperties.getMessage(resource, "ExampleSAXErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "ExampleSAXErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } catch (ParserConfigurationException e) { - String errMsg = UtilProperties.getMessage(resource, "ExampleParserConfigurationErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "ExampleParserConfigurationErrorRenderingScreen", UtilMisc.toMap("errorString", e.toString()), locale); Debug.logError(e, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } @@ -159,7 +159,7 @@ public class ExamplePrintServices { try { job.print(myDoc, aset); } catch (PrintException pe) { - String errMsg = UtilProperties.getMessage(resource, "ExampleUnableToPrintPDFFromXSL-FO", UtilMisc.toMap("errorString", pe.toString()), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "ExampleUnableToPrintPDFFromXSL-FO", UtilMisc.toMap("errorString", pe.toString()), locale); Debug.logError(pe, errMsg, MODULE); return ServiceUtil.returnError(errMsg); } diff --git a/example/src/main/java/org/apache/ofbiz/example/ExampleServices.java b/example/src/main/java/org/apache/ofbiz/example/ExampleServices.java index a98a391..2252719 100644 --- a/example/src/main/java/org/apache/ofbiz/example/ExampleServices.java +++ b/example/src/main/java/org/apache/ofbiz/example/ExampleServices.java @@ -29,7 +29,7 @@ import org.apache.ofbiz.service.DispatchContext; import org.apache.ofbiz.service.ServiceUtil; public class ExampleServices { - public static final String MODULE = ExampleServices.class.getName(); + private static final String MODULE = ExampleServices.class.getName(); public static Map<String, Object> sendExamplePushNotifications(DispatchContext dctx, Map<String, ? extends Object> context) { String exampleId = (String) context.get("exampleId"); diff --git a/example/src/main/java/org/apache/ofbiz/example/ExampleWebSockets.java b/example/src/main/java/org/apache/ofbiz/example/ExampleWebSockets.java index 36eaf75..6c15c1b 100644 --- a/example/src/main/java/org/apache/ofbiz/example/ExampleWebSockets.java +++ b/example/src/main/java/org/apache/ofbiz/example/ExampleWebSockets.java @@ -35,7 +35,7 @@ import org.apache.ofbiz.base.util.Debug; @ServerEndpoint("/ws/pushNotifications") public class ExampleWebSockets { - public static final String MODULE = ExampleWebSockets.class.getName(); + private static final String MODULE = ExampleWebSockets.class.getName(); private static Set<Session> clients = Collections.synchronizedSet(new HashSet<Session>()); diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java b/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java index 8c0bd14..6417d5e 100644 --- a/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java +++ b/lucene/src/main/java/org/apache/ofbiz/content/search/DocumentIndexer.java @@ -39,7 +39,7 @@ import org.apache.lucene.store.LockObtainFailedException; public class DocumentIndexer extends Thread { - public static final String MODULE = DocumentIndexer.class.getName(); + private static final String MODULE = DocumentIndexer.class.getName(); private static Map<String, DocumentIndexer> documentIndexerMap = new HashMap<>(); private LinkedBlockingQueue<LuceneDocument> documentIndexQueue = new LinkedBlockingQueue<>(); diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/SearchEvents.java b/lucene/src/main/java/org/apache/ofbiz/content/search/SearchEvents.java index b82c0d4..f848ae1 100644 --- a/lucene/src/main/java/org/apache/ofbiz/content/search/SearchEvents.java +++ b/lucene/src/main/java/org/apache/ofbiz/content/search/SearchEvents.java @@ -39,7 +39,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public class SearchEvents { - public static final String MODULE = SearchEvents.class.getName(); + private static final String MODULE = SearchEvents.class.getName(); public static String indexContentTree(HttpServletRequest request, HttpServletResponse response) { diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/SearchServices.java b/lucene/src/main/java/org/apache/ofbiz/content/search/SearchServices.java index 64c32ad..2f87030 100644 --- a/lucene/src/main/java/org/apache/ofbiz/content/search/SearchServices.java +++ b/lucene/src/main/java/org/apache/ofbiz/content/search/SearchServices.java @@ -43,8 +43,8 @@ import java.util.HashMap; */ public class SearchServices { - public static final String MODULE = SearchServices.class.getName(); - public static final String resource = "ContentUiLabels"; + private static final String MODULE = SearchServices.class.getName(); + private static final String RESOURCE = "ContentUiLabels"; public static Map<String, Object> indexContentTree(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -55,7 +55,7 @@ public class SearchServices { SearchWorker.indexContentTree(dispatcher, delegator, siteId); } catch (Exception e) { Debug.logError(e, MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource, + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ContentIndexingTreeError", UtilMisc.toMap("errorString", e.toString()), locale)); } return ServiceUtil.returnSuccess(); diff --git a/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java b/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java index 44df97e..920b8ba 100644 --- a/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java +++ b/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java @@ -39,7 +39,7 @@ import org.apache.ofbiz.service.LocalDispatcher; */ public final class SearchWorker { - public static final String MODULE = SearchWorker.class.getName(); + private static final String MODULE = SearchWorker.class.getName(); private static final Version LUCENE_VERSION = Version.LUCENE_8_5_0; diff --git a/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java b/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java index f8bfca3..56a4d9f 100644 --- a/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java +++ b/passport/src/main/java/org/apache/ofbiz/passport/event/GitHubEvents.java @@ -68,9 +68,9 @@ import org.apache.ofbiz.service.LocalDispatcher; */ public class GitHubEvents { - public static final String MODULE = GitHubEvents.class.getName(); + private static final String MODULE = GitHubEvents.class.getName(); - public static final String resource = "PassportUiLabels"; + private static final String RESOURCE = "PassportUiLabels"; public static final String AuthorizeUri = "/login/oauth/authorize"; @@ -114,12 +114,12 @@ public class GitHubEvents { Debug.logInfo("Request to GitHub: " + redirectUrl, MODULE); response.sendRedirect(redirectUrl); } catch (NullPointerException e) { - String errMsg = UtilProperties.getMessage(resource, "GitHubRedirectToOAuth2NullException", UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "GitHubRedirectToOAuth2NullException", UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } catch (IOException e) { Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.toString()); - String errMsg = UtilProperties.getMessage(resource, "GitHubRedirectToOAuth2Error", messageMap, UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "GitHubRedirectToOAuth2Error", messageMap, UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } @@ -136,7 +136,7 @@ public class GitHubEvents { String authorizationCode = request.getParameter(PassportUtil.COMMON_CODE); String state = request.getParameter(PassportUtil.COMMON_STATE); if (!state.equals(request.getSession().getAttribute(SESSION_GITHUB_STATE))) { - String errMsg = UtilProperties.getMessage(resource, "GitHubFailedToMatchState", UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "GitHubFailedToMatchState", UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } @@ -145,9 +145,9 @@ public class GitHubEvents { String errorDescpriton = request.getParameter(PassportUtil.COMMON_ERROR_DESCRIPTION); String errMsg = null; try { - errMsg = UtilProperties.getMessage(resource, "FailedToGetGitHubAuthorizationCode", UtilMisc.toMap(PassportUtil.COMMON_ERROR, error, PassportUtil.COMMON_ERROR_DESCRIPTION, URLDecoder.decode(errorDescpriton, "UTF-8")), UtilHttp.getLocale(request)); + errMsg = UtilProperties.getMessage(RESOURCE, "FailedToGetGitHubAuthorizationCode", UtilMisc.toMap(PassportUtil.COMMON_ERROR, error, PassportUtil.COMMON_ERROR_DESCRIPTION, URLDecoder.decode(errorDescpriton, "UTF-8")), UtilHttp.getLocale(request)); } catch (UnsupportedEncodingException e) { - errMsg = UtilProperties.getMessage(resource, "GitHubGetAuthorizationCodeError", UtilHttp.getLocale(request)); + errMsg = UtilProperties.getMessage(RESOURCE, "GitHubGetAuthorizationCodeError", UtilHttp.getLocale(request)); } request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; @@ -156,7 +156,7 @@ public class GitHubEvents { GenericValue oauth2GitHub = getOAuth2GitHubConfig(request); if (UtilValidate.isEmpty(oauth2GitHub)) { - String errMsg = UtilProperties.getMessage(resource, "GitHubGetOAuth2ConfigError", UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "GitHubGetOAuth2ConfigError", UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } @@ -198,7 +198,7 @@ public class GitHubEvents { // Debug.logInfo("Generated Access Token : " + accessToken, MODULE); // Debug.logInfo("Token Type: " + tokenType, MODULE); } else { - String errMsg = UtilProperties.getMessage(resource, "GitHubGetOAuth2AccessTokenError", UtilMisc.toMap("error", responseString), UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "GitHubGetOAuth2AccessTokenError", UtilMisc.toMap("error", responseString), UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } @@ -310,7 +310,7 @@ public class GitHubEvents { return getOAuth2GitHubConfig(delegator, productStoreId); } catch (GenericEntityException e) { Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.toString()); - String errMsg = UtilProperties.getMessage(resource, "GitHubGetOAuth2Error", messageMap, UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "GitHubGetOAuth2Error", messageMap, UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); } return null; diff --git a/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java b/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java index 59ece75..2caf5bc 100644 --- a/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java +++ b/passport/src/main/java/org/apache/ofbiz/passport/event/LinkedInEvents.java @@ -71,9 +71,9 @@ import org.xml.sax.SAXException; */ public class LinkedInEvents { - public static final String MODULE = LinkedInEvents.class.getName(); + private static final String MODULE = LinkedInEvents.class.getName(); - public static final String resource = "PassportUiLabels"; + private static final String RESOURCE = "PassportUiLabels"; public static final String AuthorizeUri = "/uas/oauth2/authorization"; @@ -115,12 +115,12 @@ public class LinkedInEvents { + "&state=" + state; response.sendRedirect(redirectUrl); } catch (NullPointerException e) { - String errMsg = UtilProperties.getMessage(resource, "LinkedInRedirectToOAuth2NullException", UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "LinkedInRedirectToOAuth2NullException", UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } catch (IOException e) { Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.toString()); - String errMsg = UtilProperties.getMessage(resource, "LinkedInRedirectToOAuth2Error", messageMap, UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "LinkedInRedirectToOAuth2Error", messageMap, UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } @@ -137,7 +137,7 @@ public class LinkedInEvents { String authorizationCode = request.getParameter(PassportUtil.COMMON_CODE); String state = request.getParameter(PassportUtil.COMMON_STATE); if (!state.equals(request.getSession().getAttribute(SESSION_LINKEDIN_STATE))) { - String errMsg = UtilProperties.getMessage(resource, "LinkedInFailedToMatchState", UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "LinkedInFailedToMatchState", UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } @@ -146,9 +146,9 @@ public class LinkedInEvents { String errorDescpriton = request.getParameter(PassportUtil.COMMON_ERROR_DESCRIPTION); String errMsg = null; try { - errMsg = UtilProperties.getMessage(resource, "LinkedInFailedToGetAuthorizationCode", UtilMisc.toMap(PassportUtil.COMMON_ERROR, error, PassportUtil.COMMON_ERROR_DESCRIPTION, URLDecoder.decode(errorDescpriton, "UTF-8")), UtilHttp.getLocale(request)); + errMsg = UtilProperties.getMessage(RESOURCE, "LinkedInFailedToGetAuthorizationCode", UtilMisc.toMap(PassportUtil.COMMON_ERROR, error, PassportUtil.COMMON_ERROR_DESCRIPTION, URLDecoder.decode(errorDescpriton, "UTF-8")), UtilHttp.getLocale(request)); } catch (UnsupportedEncodingException e) { - errMsg = UtilProperties.getMessage(resource, "LinkedInGetAuthorizationCodeError", UtilHttp.getLocale(request)); + errMsg = UtilProperties.getMessage(RESOURCE, "LinkedInGetAuthorizationCodeError", UtilHttp.getLocale(request)); } request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; @@ -157,7 +157,7 @@ public class LinkedInEvents { GenericValue oauth2LinkedIn = getOAuth2LinkedInConfig(request); if (UtilValidate.isEmpty(oauth2LinkedIn)) { - String errMsg = UtilProperties.getMessage(resource, "LinkedInGetOAuth2ConfigError", UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "LinkedInGetOAuth2ConfigError", UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } @@ -196,7 +196,7 @@ public class LinkedInEvents { accessToken = (String) userMap.get("access_token"); // Debug.logInfo("Generated Access Token : " + accessToken, MODULE); } else { - String errMsg = UtilProperties.getMessage(resource, "LinkedInGetOAuth2AccessTokenError", UtilMisc.toMap("error", responseString), UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "LinkedInGetOAuth2AccessTokenError", UtilMisc.toMap("error", responseString), UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } @@ -317,7 +317,7 @@ public class LinkedInEvents { return getOAuth2LinkedInConfig(delegator, productStoreId); } catch (GenericEntityException e) { Map<String, String> messageMap = UtilMisc.toMap("errorMessage", e.toString()); - String errMsg = UtilProperties.getMessage(resource, "LinkedInGetOAuth2Error", messageMap, UtilHttp.getLocale(request)); + String errMsg = UtilProperties.getMessage(RESOURCE, "LinkedInGetOAuth2Error", messageMap, UtilHttp.getLocale(request)); request.setAttribute("_ERROR_MESSAGE_", errMsg); } return null; diff --git a/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java b/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java index 695f68f..ea1600c 100644 --- a/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java +++ b/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java @@ -66,7 +66,7 @@ public class GitHubAuthenticator implements Authenticator { public static final String props = "gitHubAuth.properties"; - public static final String resource = "PassportUiLabels"; + private static final String RESOURCE = "PassportUiLabels"; protected LocalDispatcher dispatcher; @@ -399,7 +399,7 @@ public class GitHubAuthenticator implements Authenticator { // Debug.logInfo("Json Response from GitHub: " + responseString, MODULE); userInfo = JSON.from(responseString); } else { - String errMsg = UtilProperties.getMessage(resource, "GetOAuth2AccessTokenError", UtilMisc.toMap("error", responseString), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "GetOAuth2AccessTokenError", UtilMisc.toMap("error", responseString), locale); throw new AuthenticatorException(errMsg); } } catch (ClientProtocolException e) { diff --git a/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java b/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java index 65e1e78..0316dd5 100644 --- a/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java +++ b/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java @@ -67,7 +67,7 @@ public class LinkedInAuthenticator implements Authenticator { public static final String props = "linkedInAuth.properties"; - public static final String resource = "PassportUiLabels"; + private static final String RESOURCE = "PassportUiLabels"; protected LocalDispatcher dispatcher; @@ -415,7 +415,7 @@ public class LinkedInAuthenticator implements Authenticator { // Debug.logInfo("Json Response from LinkedIn: " + responseString, MODULE); userInfo = UtilXml.readXmlDocument(responseString); } else { - String errMsg = UtilProperties.getMessage(resource, "GetOAuth2AccessTokenError", UtilMisc.toMap("error", responseString), locale); + String errMsg = UtilProperties.getMessage(RESOURCE, "GetOAuth2AccessTokenError", UtilMisc.toMap("error", responseString), locale); throw new AuthenticatorException(errMsg); } return userInfo; diff --git a/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java b/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java index e709309..9cea0e0 100644 --- a/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java +++ b/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java @@ -28,7 +28,7 @@ import org.apache.ofbiz.base.util.Debug; public class PassportUtil { - public static final String MODULE = PassportUtil.class.getName(); + private static final String MODULE = PassportUtil.class.getName(); public static final String ClientIdLabel = "ClientId"; diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java index 5f080e4..8a01fad 100644 --- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java +++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java @@ -30,7 +30,7 @@ import org.apache.ofbiz.htmlreport.util.ReportStringUtil; */ public abstract class AbstractHtmlReport extends HtmlReport { - public static final String MODULE = AbstractHtmlReport.class.getName(); + private static final String MODULE = AbstractHtmlReport.class.getName(); public final static String THREAD_TYPE = "thread_type"; diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java index af789c2..50ffafc 100644 --- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java +++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java @@ -50,12 +50,12 @@ import org.apache.ofbiz.htmlreport.util.ReportStringUtil; */ public class HtmlReport extends AbstractReport { - public static final String MODULE = HtmlReport.class.getName(); + private static final String MODULE = HtmlReport.class.getName(); - /** The delimiter that is used in the resource list request parameter. */ + /** The delimiter that is used in the RESOURCE list request parameter. */ public static final String DELIMITER_RESOURCES = "|"; - /** Request parameter name for the resource list. */ + /** Request parameter name for the RESOURCE list. */ public static final String PARAM_RESOURCELIST = "resourcelist"; /** Constant for a HTML linebreak with added "real" line break. */ @@ -157,10 +157,10 @@ public class HtmlReport extends AbstractReport { /** Request parameter value for the action: set. */ public static final String DIALOG_SET = "set"; - /** The resource list parameter value. */ + /** The RESOURCE list parameter value. */ protected String paramResourcelist; - /** The list of resource names for the multi operation. */ + /** The list of RESOURCE names for the multi operation. */ protected List<String> resourceList; /** The key name which contains the localized message for the continue checkbox. */ @@ -170,7 +170,7 @@ public class HtmlReport extends AbstractReport { public static final String FORM_URI = "formuri"; - public static final String resource = "PricatUiLabels"; + private static final String RESOURCE = "PricatUiLabels"; /** Log file. */ protected File logFile; @@ -433,7 +433,7 @@ public class HtmlReport extends AbstractReport { StringBuffer buf = new StringBuffer(256); if (showExceptionStackTrace) { buf.append("aT('"); - buf.append(UtilProperties.getMessage(resource, "REPORT_EXCEPTION", getLocale())); + buf.append(UtilProperties.getMessage(RESOURCE, "REPORT_EXCEPTION", getLocale())); String exception = ReportEncoder.escapeXml(throwable.getLocalizedMessage()); if (UtilValidate.isEmpty(exception)) { exception = ReportEncoder.escapeXml(throwable.getMessage()); @@ -447,7 +447,7 @@ public class HtmlReport extends AbstractReport { buf.append("'); "); } else { buf.append("aT('"); - buf.append(UtilProperties.getMessage(resource, "REPORT_EXCEPTION", getLocale())); + buf.append(UtilProperties.getMessage(RESOURCE, "REPORT_EXCEPTION", getLocale())); buf.append(ReportStringUtil.escapeJavaScript(throwable.toString())); buf.append("'); "); } @@ -458,7 +458,7 @@ public class HtmlReport extends AbstractReport { StringBuffer buf = new StringBuffer(256); if (showExceptionStackTrace) { buf.append("<span class='throw'>"); - buf.append(UtilProperties.getMessage(resource, "REPORT_EXCEPTION", getLocale())); + buf.append(UtilProperties.getMessage(RESOURCE, "REPORT_EXCEPTION", getLocale())); String exception = ReportEncoder.escapeXml(throwable.getLocalizedMessage()); if (UtilValidate.isEmpty(exception)) { exception = ReportEncoder.escapeXml(throwable.getMessage()); @@ -472,7 +472,7 @@ public class HtmlReport extends AbstractReport { buf.append("</span>"); } else { buf.append("<span class='throw'>"); - buf.append(UtilProperties.getMessage(resource, "REPORT_EXCEPTION", getLocale())); + buf.append(UtilProperties.getMessage(RESOURCE, "REPORT_EXCEPTION", getLocale())); buf.append(throwable.toString()); buf.append("</span>"); buf.append(getLineBreak()); @@ -1027,7 +1027,7 @@ public class HtmlReport extends AbstractReport { switch (button) { case BUTTON_OK: result.append("<input name=\"ok\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_OK", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_OK", getLocale()) + "\""); if (attribute.toLowerCase().indexOf("onclick") == -1) { result.append(" type=\"submit\""); } else { @@ -1039,7 +1039,7 @@ public class HtmlReport extends AbstractReport { break; case BUTTON_CANCEL: result.append("<input name=\"cancel\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_CANCEL", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_CANCEL", getLocale()) + "\""); if (attribute.toLowerCase().indexOf("onclick") == -1) { result.append(" onclick=\"submitAction('" + DIALOG_CANCEL + "', form);\""); } @@ -1049,7 +1049,7 @@ public class HtmlReport extends AbstractReport { break; case BUTTON_EDIT: result.append("<input name=\"ok\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_EDIT", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_EDIT", getLocale()) + "\""); if (attribute.toLowerCase().indexOf("onclick") == -1) { result.append(" type=\"submit\""); } else { @@ -1061,7 +1061,7 @@ public class HtmlReport extends AbstractReport { break; case BUTTON_DISCARD: result.append("<input name=\"cancel\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_DISCARD", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_DISCARD", getLocale()) + "\""); if (attribute.toLowerCase().indexOf("onclick") == -1) { result.append(" onclick=\"submitAction('" + DIALOG_CANCEL + "', form);\""); } @@ -1071,7 +1071,7 @@ public class HtmlReport extends AbstractReport { break; case BUTTON_CLOSE: result.append("<input name=\"close\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_CLOSE", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_CLOSE", getLocale()) + "\""); if (attribute.toLowerCase().indexOf("onclick") == -1) { result.append(" onclick=\"submitAction('" + DIALOG_CANCEL + "', form);\""); } @@ -1081,14 +1081,14 @@ public class HtmlReport extends AbstractReport { break; case BUTTON_ADVANCED: result.append("<input name=\"advanced\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_ADVANCE", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_ADVANCE", getLocale()) + "\""); result.append(" class=\"dialogbutton\""); result.append(attribute); result.append(">\n"); break; case BUTTON_SET: result.append("<input name=\"set\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_SET", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_SET", getLocale()) + "\""); if (attribute.toLowerCase().indexOf("onclick") == -1) { result.append(" onclick=\"submitAction('" + DIALOG_SET + "', form);\""); } @@ -1098,7 +1098,7 @@ public class HtmlReport extends AbstractReport { break; case BUTTON_BACK: result.append("<input name=\"set\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_BACK", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_BACK", getLocale()) + "\""); if (attribute.toLowerCase().indexOf("onclick") == -1) { result.append(" onclick=\"submitAction('" + DIALOG_BACK + "', form);\""); } @@ -1108,7 +1108,7 @@ public class HtmlReport extends AbstractReport { break; case BUTTON_CONTINUE: result.append("<input name=\"set\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_CONTINUE", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_CONTINUE", getLocale()) + "\""); if (attribute.toLowerCase().indexOf("onclick") == -1) { result.append(" onclick=\"submitAction('" + DIALOG_CONTINUE + "', form);\""); } @@ -1118,14 +1118,14 @@ public class HtmlReport extends AbstractReport { break; case BUTTON_DETAILS: result.append("<input name=\"details\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_DETAIL", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_DETAIL", getLocale()) + "\""); result.append(" class=\"dialogbutton\""); result.append(attribute); result.append(">\n"); break; case BUTTON_DOWNLOAD: result.append("<input name=\"download\" type=\"button\" value=\""); - result.append(UtilProperties.getMessage(resource, "DIALOG_BUTTON_DOWNLOAD", getLocale()) + "\""); + result.append(UtilProperties.getMessage(RESOURCE, "DIALOG_BUTTON_DOWNLOAD", getLocale()) + "\""); result.append(" class=\"dialogbutton\""); result.append(attribute); result.append(">\n"); @@ -1169,8 +1169,8 @@ public class HtmlReport extends AbstractReport { /** * Returns the resources that are defined for the dialog operation. * - * For single resource operations, the list contains one item: the resource name found - * in the request parameter value of the "resource" parameter. + * For single RESOURCE operations, the list contains one item: the RESOURCE name found + * in the request parameter value of the "RESOURCE" parameter. * * @return the resources that are defined for the dialog operation */ @@ -1182,7 +1182,7 @@ public class HtmlReport extends AbstractReport { resourceList = StringUtil.split(getParamResourcelist(request), DELIMITER_RESOURCES); Collections.sort(resourceList); } else { - // this is a single resource operation, create list containing the resource name + // this is a single RESOURCE operation, create list containing the RESOURCE name resourceList = new ArrayList<>(1); String resource = getParamResource(request); if (ReportStringUtil.isNotEmptyOrWhitespaceOnly(resource)) { @@ -1196,11 +1196,11 @@ public class HtmlReport extends AbstractReport { } /** - * Returns the value of the resource list parameter, or null if the parameter is not provided.<p> + * Returns the value of the RESOURCE list parameter, or null if the parameter is not provided.<p> * * This parameter selects the resources to perform operations on.<p> * - * @return the value of the resource list parameter or null, if the parameter is not provided + * @return the value of the RESOURCE list parameter or null, if the parameter is not provided */ public String getParamResourcelist(HttpServletRequest request) { if (ReportStringUtil.isNotEmpty(paramResourcelist) && !"null".equals(paramResourcelist)) { @@ -1251,7 +1251,7 @@ public class HtmlReport extends AbstractReport { /** * Returns the value of the resourcelist parameter in form of a String separated - * with {@link #DELIMITER_RESOURCES}, or the value of the resource parameter if the + * with {@link #DELIMITER_RESOURCES}, or the value of the RESOURCE parameter if the * first parameter is not provided (no multiple choice has been done.<p> * * This may be used for jsps as value for the parameter for resources {@link #PARAM_RESOURCELIST}.<p> @@ -1333,7 +1333,7 @@ public class HtmlReport extends AbstractReport { logFileOutputStream.close(); } catch (IOException e) { // do nothing - Debug.logError(e, HtmlReport.MODULE); + Debug.logError(e, MODULE); } } } diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java index 515187a..605d823 100644 --- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java +++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java @@ -48,7 +48,7 @@ public class SampleHtmlThread extends AbstractReportThread { public static final List<String> messages = Collections.unmodifiableList(Arrays.asList(messageLables)); - private static final String resource = "PricatUiLabels"; + private static final String RESOURCE = "PricatUiLabels"; /** * Constructor, creates a new HtmlImportThreat. @@ -68,33 +68,33 @@ public class SampleHtmlThread extends AbstractReportThread { public void run() { try { if (getName().startsWith(COUNT_DOWN)) { - getReport().println(UtilProperties.getMessage(resource, "START_COUNT_DOWN", getLocale()), InterfaceReport.FORMAT_HEADLINE); + getReport().println(UtilProperties.getMessage(RESOURCE, "START_COUNT_DOWN", getLocale()), InterfaceReport.FORMAT_HEADLINE); Random random = new Random(); int j = 0; for (int i=1000; i>0; i--) { sleep(20); j = random.nextInt(7); if (j == 6) { - getReport().println(new Throwable(UtilProperties.getMessage(resource, messages.get(j), new Object[] {i}, getLocale()))); + getReport().println(new Throwable(UtilProperties.getMessage(RESOURCE, messages.get(j), new Object[] {i}, getLocale()))); } else { - getReport().println(UtilProperties.getMessage(resource, messages.get(j), new Object[] {i}, getLocale()), j); + getReport().println(UtilProperties.getMessage(RESOURCE, messages.get(j), new Object[] {i}, getLocale()), j); } } - getReport().println(UtilProperties.getMessage(resource, "COUNT_COMPLETED", getLocale()), InterfaceReport.FORMAT_HEADLINE); + getReport().println(UtilProperties.getMessage(RESOURCE, "COUNT_COMPLETED", getLocale()), InterfaceReport.FORMAT_HEADLINE); } else if (getName().startsWith(COUNT_UP)) { - getReport().println(UtilProperties.getMessage(resource, "START_COUNT_UP", getLocale()), InterfaceReport.FORMAT_HEADLINE); + getReport().println(UtilProperties.getMessage(RESOURCE, "START_COUNT_UP", getLocale()), InterfaceReport.FORMAT_HEADLINE); Random random = new Random(); int j = 0; for (int i=1; i<=1000; i++) { sleep(20); j = random.nextInt(7); if (j == 6) { - getReport().println(new Throwable(UtilProperties.getMessage(resource, messages.get(j), new Object[] {i}, getLocale()))); + getReport().println(new Throwable(UtilProperties.getMessage(RESOURCE, messages.get(j), new Object[] {i}, getLocale()))); } else { - getReport().println(UtilProperties.getMessage(resource, messages.get(j), new Object[] {i}, getLocale()), j); + getReport().println(UtilProperties.getMessage(RESOURCE, messages.get(j), new Object[] {i}, getLocale()), j); } } - getReport().println(UtilProperties.getMessage(resource, "COUNT_COMPLETED", getLocale()), InterfaceReport.FORMAT_HEADLINE); + getReport().println(UtilProperties.getMessage(RESOURCE, "COUNT_COMPLETED", getLocale()), InterfaceReport.FORMAT_HEADLINE); } else { getReport().println(getName(), InterfaceReport.FORMAT_ERROR); } diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java b/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java index 2951f0b..382d126 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java @@ -79,7 +79,7 @@ import org.apache.ofbiz.service.ServiceUtil; */ public abstract class AbstractPricatParser implements InterfacePricatParser { - public static final String MODULE = AbstractPricatParser.class.getName(); + private static final String MODULE = AbstractPricatParser.class.getName(); protected LocalDispatcher dispatcher; @@ -136,7 +136,7 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { @Override public void writeCommentsToFile(XSSFWorkbook workbook, XSSFSheet sheet) { report.println(); - report.print(UtilProperties.getMessage(resource, "WriteCommentsBackToExcel", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "WriteCommentsBackToExcel", locale), InterfaceReport.FORMAT_NOTE); FileOutputStream fos = null; XSSFCreationHelper factory = workbook.getCreationHelper(); XSSFFont boldFont = workbook.createFont(); @@ -288,7 +288,7 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { } } } - report.println(UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); + report.println(UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); report.println(); } @@ -395,14 +395,14 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { @Override public boolean isNumOfSheetsOK(XSSFWorkbook workbook) { - report.print(UtilProperties.getMessage(resource, "CheckPricatHasSheet", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "CheckPricatHasSheet", locale), InterfaceReport.FORMAT_NOTE); int sheets = workbook.getNumberOfSheets(); if (sheets < 1) { - report.println(UtilProperties.getMessage(resource, "PricatTableNoSheet", locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "PricatTableNoSheet", locale), InterfaceReport.FORMAT_ERROR); return false; } else if (sheets >= 1) { - report.println(UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); - report.println(UtilProperties.getMessage(resource, "PricatTableOnlyParse1stSheet", locale), InterfaceReport.FORMAT_WARNING); + report.println(UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); + report.println(UtilProperties.getMessage(RESOURCE, "PricatTableOnlyParse1stSheet", locale), InterfaceReport.FORMAT_WARNING); } return true; } @@ -429,8 +429,8 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { } if (cell == null) { if ((Boolean) colNames.get(i)[2]) { - report.print(UtilProperties.getMessage(resource, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale), InterfaceReport.FORMAT_WARNING); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale)); + report.print(UtilProperties.getMessage(RESOURCE, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale), InterfaceReport.FORMAT_WARNING); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale)); foundError = true; continue; } else { @@ -450,8 +450,8 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { report.print(((i == 0)?"":","), InterfaceReport.FORMAT_NOTE); } if ((Boolean) colNames.get(i)[2] && UtilValidate.isEmpty(cellValue)) { - report.print(UtilProperties.getMessage(resource, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale), InterfaceReport.FORMAT_WARNING); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale)); + report.print(UtilProperties.getMessage(RESOURCE, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale), InterfaceReport.FORMAT_WARNING); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale)); foundError = true; results.add(null); continue; @@ -468,7 +468,7 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { results.add(BigDecimal.valueOf(Double.parseDouble(cell.getStringCellValue())).setScale(FinAccountHelper.decimals, FinAccountHelper.rounding)); } catch (NumberFormatException e) { results.add(null); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorParseValueToNumeric", locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorParseValueToNumeric", locale)); } } } else { @@ -488,21 +488,21 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { results.add(BigDecimal.valueOf(Double.valueOf(cell.getStringCellValue()))); } catch (NumberFormatException e) { results.add(null); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorParseValueToNumeric", locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorParseValueToNumeric", locale)); } } else if (cell.getCellType() == CellType.NUMERIC) { try { results.add(BigDecimal.valueOf(cell.getNumericCellValue()).setScale(FinAccountHelper.decimals, FinAccountHelper.rounding)); } catch (NumberFormatException e) { results.add(null); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorParseValueToNumeric", locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorParseValueToNumeric", locale)); } } else { try { results.add(BigDecimal.valueOf(Double.valueOf(cellValue)).setScale(FinAccountHelper.decimals, FinAccountHelper.rounding)); } catch (NumberFormatException e) { results.add(null); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorParseValueToNumeric", locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorParseValueToNumeric", locale)); } } } @@ -522,7 +522,7 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { protected boolean isEmptyRow(XSSFRow row, int size, boolean display) { // check whether this row is empty if (UtilValidate.isEmpty(row)) { - report.print(UtilProperties.getMessage(resource, "ExcelEmptyRow", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "ExcelEmptyRow", locale), InterfaceReport.FORMAT_NOTE); return true; } boolean isEmptyRow = true; @@ -540,12 +540,12 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { } if (isEmptyRow) { if (display) { - report.print(UtilProperties.getMessage(resource, "ExcelEmptyRow", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "ExcelEmptyRow", locale), InterfaceReport.FORMAT_NOTE); } return true; } else if (!isEmptyRow && i > size) { if (display) { - report.print(UtilProperties.getMessage(resource, "IgnoreDataOutOfRange", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "IgnoreDataOutOfRange", locale), InterfaceReport.FORMAT_NOTE); } return true; } @@ -632,13 +632,13 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { protected void cleanupLogAndCommentedExcel() { try { - report.print(UtilProperties.getMessage(resource, "CLEANUP_LOGANDEXCEL_BEGIN", locale), InterfaceReport.FORMAT_DEFAULT); + report.print(UtilProperties.getMessage(RESOURCE, "CLEANUP_LOGANDEXCEL_BEGIN", locale), InterfaceReport.FORMAT_DEFAULT); List<GenericValue> historyValues = EntityQuery.use(delegator).from("ExcelImportHistory").where("userLoginId", userLoginId).orderBy("sequenceNum DESC").queryList(); if (UtilValidate.isEmpty(historyValues) || historyValues.size() <= HISTORY_MAX_FILENUMBER) { - report.print(UtilProperties.getMessage(resource, "HistoryLessThan", new Object[] {String.valueOf(HISTORY_MAX_FILENUMBER)}, locale), InterfaceReport.FORMAT_NOTE); - report.println(" ... " + UtilProperties.getMessage(resource, "skipped", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "HistoryLessThan", new Object[] {String.valueOf(HISTORY_MAX_FILENUMBER)}, locale), InterfaceReport.FORMAT_NOTE); + report.println(" ... " + UtilProperties.getMessage(RESOURCE, "skipped", locale), InterfaceReport.FORMAT_NOTE); } else { - report.print(" ... " + UtilProperties.getMessage(resource, "HistoryEntryToRemove", new Object[] {historyValues.size() - HISTORY_MAX_FILENUMBER}, locale), InterfaceReport.FORMAT_NOTE); + report.print(" ... " + UtilProperties.getMessage(RESOURCE, "HistoryEntryToRemove", new Object[] {historyValues.size() - HISTORY_MAX_FILENUMBER}, locale), InterfaceReport.FORMAT_NOTE); List<GenericValue> valuesToRemove = new ArrayList<>(); for (int i = HISTORY_MAX_FILENUMBER; i < historyValues.size(); i++) { GenericValue historyValue = historyValues.get(i); @@ -663,7 +663,7 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { } } delegator.removeAll(valuesToRemove); - report.println(" ... " + UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); + report.println(" ... " + UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); } report.println(); } catch (GenericEntityException e) { diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java b/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java index 0bfa9e8..97e382b 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/InterfacePricatParser.java @@ -59,7 +59,7 @@ public interface InterfacePricatParser { public static final String FACILITY_ID = "facilityId"; - public static final String resource = "PricatUiLabels"; + public static final String RESOURCE = "PricatUiLabels"; public static final String PRICAT_FILE = "__PRICAT_FILE__"; diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatEvents.java b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatEvents.java index 2ccf36e..3a999fa 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatEvents.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatEvents.java @@ -43,7 +43,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; public class PricatEvents { - public static final String MODULE = PricatEvents.class.getName(); + private static final String MODULE = PricatEvents.class.getName(); public static final String PricatLatestVersion = UtilProperties.getPropertyValue("pricat", "pricat.latest.version", "V1.1"); diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java index d6c6dc1..8ce0884 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java @@ -66,7 +66,7 @@ import org.apache.ofbiz.service.LocalDispatcher; */ public class PricatParseExcelHtmlThread extends AbstractReportThread { - public static final String MODULE = PricatParseExcelHtmlThread.class.getName(); + private static final String MODULE = PricatParseExcelHtmlThread.class.getName(); public static final String PARSE_EXCEL = "parse_excel"; @@ -102,7 +102,7 @@ public class PricatParseExcelHtmlThread extends AbstractReportThread { private Map<String, String[]> facilities = new HashMap<>(); - public static final String resource = "PricatUiLabels"; + private static final String RESOURCE = "PricatUiLabels"; private HttpSession session; @@ -134,7 +134,7 @@ public class PricatParseExcelHtmlThread extends AbstractReportThread { userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); if (UtilValidate.isEmpty(userLogin)) { initHtmlReport(request, response, true, true); - getReport().println(UtilProperties.getMessage(resource, "PricatRequireUserLogin", getLocale()), InterfaceReport.FORMAT_ERROR); + getReport().println(UtilProperties.getMessage(RESOURCE, "PricatRequireUserLogin", getLocale()), InterfaceReport.FORMAT_ERROR); return; } else { userLoginId = userLogin.getString("userLoginId"); @@ -153,16 +153,16 @@ public class PricatParseExcelHtmlThread extends AbstractReportThread { getReport().addLogFile(logFileName); } try { - getReport().print(UtilProperties.getMessage(resource, "StartStoreExcel", getLocale()), InterfaceReport.FORMAT_HEADLINE); + getReport().print(UtilProperties.getMessage(RESOURCE, "StartStoreExcel", getLocale()), InterfaceReport.FORMAT_HEADLINE); ServletFileUpload dfu = new ServletFileUpload(new DiskFileItemFactory(10240, userFolder)); fileItems = UtilGenerics.cast(dfu.parseRequest(request)); } catch (FileUploadException e) { getReport().addError(e); } if (UtilValidate.isEmpty(fileItems)) { - getReport().println(UtilProperties.getMessage(resource, "NoFileUploaded", getLocale()), InterfaceReport.FORMAT_ERROR); + getReport().println(UtilProperties.getMessage(RESOURCE, "NoFileUploaded", getLocale()), InterfaceReport.FORMAT_ERROR); } else { - getReport().println(UtilProperties.getMessage(resource, "ok", getLocale()), InterfaceReport.FORMAT_OK); + getReport().println(UtilProperties.getMessage(RESOURCE, "ok", getLocale()), InterfaceReport.FORMAT_OK); } } @@ -178,16 +178,16 @@ public class PricatParseExcelHtmlThread extends AbstractReportThread { try { if (getName().startsWith(PARSE_EXCEL) && UtilValidate.isNotEmpty(fileItems)) { getReport().println(); - getReport().println(UtilProperties.getMessage(resource, "StartParsePricat", getLocale()), InterfaceReport.FORMAT_HEADLINE); + getReport().println(UtilProperties.getMessage(RESOURCE, "StartParsePricat", getLocale()), InterfaceReport.FORMAT_HEADLINE); if (prepareParse()) { if (selectedPricatType.equals(DEFAULT_PRICAT_TYPE)) { pricatParser = new SamplePricatParser(dispatcher, delegator, getLocale(), getReport(), facilities, pricatFile, userLogin); } if (UtilValidate.isEmpty(pricatParser)) { - getReport().println(UtilProperties.getMessage(resource, "NoPricatParserFor", getLocale()), InterfaceReport.FORMAT_ERROR); + getReport().println(UtilProperties.getMessage(RESOURCE, "NoPricatParserFor", getLocale()), InterfaceReport.FORMAT_ERROR); } else { pricatParser.parsePricatExcel(); - getReport().println(UtilProperties.getMessage(resource, "PricatParseCompleted", getLocale()), InterfaceReport.FORMAT_HEADLINE); + getReport().println(UtilProperties.getMessage(RESOURCE, "PricatParseCompleted", getLocale()), InterfaceReport.FORMAT_HEADLINE); } } } else { @@ -221,10 +221,10 @@ public class PricatParseExcelHtmlThread extends AbstractReportThread { // 1 get facilities belong to current userLogin facilities = getCurrentUserLoginFacilities(); if (UtilValidate.isEmpty(facilities)) { - getReport().println(UtilProperties.getMessage(resource, "CurrentUserLoginNoFacility", new Object[]{userLoginId}, getLocale()), InterfaceReport.FORMAT_ERROR); + getReport().println(UtilProperties.getMessage(RESOURCE, "CurrentUserLoginNoFacility", new Object[]{userLoginId}, getLocale()), InterfaceReport.FORMAT_ERROR); return false; } else { - getReport().println(" ... " + UtilProperties.getMessage(resource, "ok", getLocale()), InterfaceReport.FORMAT_OK); + getReport().println(" ... " + UtilProperties.getMessage(RESOURCE, "ok", getLocale()), InterfaceReport.FORMAT_OK); getReport().println(); } @@ -249,12 +249,12 @@ public class PricatParseExcelHtmlThread extends AbstractReportThread { } } } - getReport().print(UtilProperties.getMessage(resource, "ExcelTemplateTypeSelected", getLocale()), InterfaceReport.FORMAT_DEFAULT); + getReport().print(UtilProperties.getMessage(RESOURCE, "ExcelTemplateTypeSelected", getLocale()), InterfaceReport.FORMAT_DEFAULT); if (PricatTypeLabels.containsKey(selectedPricatType)) { - getReport().print(UtilProperties.getMessage(resource, PricatTypeLabels.get(selectedPricatType), getLocale()), InterfaceReport.FORMAT_DEFAULT); - getReport().println(" ... " + UtilProperties.getMessage(resource, "ok", getLocale()), InterfaceReport.FORMAT_OK); + getReport().print(UtilProperties.getMessage(RESOURCE, PricatTypeLabels.get(selectedPricatType), getLocale()), InterfaceReport.FORMAT_DEFAULT); + getReport().println(" ... " + UtilProperties.getMessage(RESOURCE, "ok", getLocale()), InterfaceReport.FORMAT_OK); } else { - getReport().println(UtilProperties.getMessage(resource, PricatTypeLabels.get(selectedPricatType), getLocale()), InterfaceReport.FORMAT_ERROR); + getReport().println(UtilProperties.getMessage(RESOURCE, PricatTypeLabels.get(selectedPricatType), getLocale()), InterfaceReport.FORMAT_ERROR); return false; } @@ -279,7 +279,7 @@ public class PricatParseExcelHtmlThread extends AbstractReportThread { private Map<String, String[]> getCurrentUserLoginFacilities() { getReport().println(); - getReport().println(UtilProperties.getMessage(resource, "GetCurrentUserLoginFacility", getLocale()), InterfaceReport.FORMAT_DEFAULT); + getReport().println(UtilProperties.getMessage(RESOURCE, "GetCurrentUserLoginFacility", getLocale()), InterfaceReport.FORMAT_DEFAULT); Map<String, Object> context = new HashMap<>(); context.put("userLogin", userLogin); context.put("locale", getLocale()); @@ -316,7 +316,7 @@ public class PricatParseExcelHtmlThread extends AbstractReportThread { if (!facilities.containsKey(facilityId)) { String facilityName = facilityValue.getString("facilityName"); facilities.put(facilityId, new String[] {facilityName, facilityValue.getString("ownerPartyId")}); - getReport().println(UtilProperties.getMessage(resource, "FacilityFoundForCurrentUserLogin", new Object[]{String.valueOf(i), facilityName, facilityId}, getLocale()), InterfaceReport.FORMAT_NOTE); + getReport().println(UtilProperties.getMessage(RESOURCE, "FacilityFoundForCurrentUserLogin", new Object[]{String.valueOf(i), facilityName, facilityId}, getLocale()), InterfaceReport.FORMAT_NOTE); i++; } } diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatEvents.java b/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatEvents.java index 8b97037..b61ae59 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatEvents.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatEvents.java @@ -37,7 +37,7 @@ import org.apache.ofbiz.pricat.PricatEvents; public class SamplePricatEvents extends PricatEvents { - public static final String MODULE = SamplePricatEvents.class.getName(); + private static final String MODULE = SamplePricatEvents.class.getName(); public static final String PricatLatestVersion = UtilProperties.getPropertyValue("pricat", "pricat.latest.version", "V1.1"); diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java b/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java index 43b2df3..827ffc1 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/sample/SamplePricatParser.java @@ -56,7 +56,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; */ public class SamplePricatParser extends AbstractPricatParser { - public static final String MODULE = SamplePricatParser.class.getName(); + private static final String MODULE = SamplePricatParser.class.getName(); public static final Map<String, List<Object[]>> ColNamesList = UtilMisc.toMap("V1.1", genExcelHeaderNames("V1.1")); @@ -79,13 +79,13 @@ public class SamplePricatParser extends AbstractPricatParser { FileInputStream is = new FileInputStream(pricatFile); // 2. use POI to load this bytes - report.print(UtilProperties.getMessage(resource, "ParsePricatFileStatement", new Object[] { pricatFile.getName() }, locale), InterfaceReport.FORMAT_DEFAULT); + report.print(UtilProperties.getMessage(RESOURCE, "ParsePricatFileStatement", new Object[] { pricatFile.getName() }, locale), InterfaceReport.FORMAT_DEFAULT); try { workbook = new XSSFWorkbook(is); - report.println(UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); + report.println(UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); } catch(IOException e) { report.println(e); - report.println(UtilProperties.getMessage(resource, "PricatSuggestion", locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "PricatSuggestion", locale), InterfaceReport.FORMAT_ERROR); return; } @@ -112,7 +112,7 @@ public class SamplePricatParser extends AbstractPricatParser { containsDataRows(sheet); if (UtilValidate.isNotEmpty(errorMessages)) { - report.println(UtilProperties.getMessage(resource, "HeaderContainsError", locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "HeaderContainsError", locale), InterfaceReport.FORMAT_ERROR); return; } @@ -120,7 +120,7 @@ public class SamplePricatParser extends AbstractPricatParser { // 4.1 parse row by row and store the contents into database parseRowByRow(sheet); if (UtilValidate.isNotEmpty(errorMessages)) { - report.println(UtilProperties.getMessage(resource, "DataContainsError", locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "DataContainsError", locale), InterfaceReport.FORMAT_ERROR); if (writeFile) { sequenceNum = report.getSequenceNum(); writeCommentsToFile(workbook, sheet); @@ -153,11 +153,11 @@ public class SamplePricatParser extends AbstractPricatParser { @Override public boolean existsCurrencyId(XSSFSheet sheet) { - report.print(UtilProperties.getMessage(resource, "StartCheckCurrencyId", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "StartCheckCurrencyId", locale), InterfaceReport.FORMAT_NOTE); XSSFCell currencyIdCell = sheet.getRow(2).getCell(1); currencyId = currencyIdCell.getStringCellValue().trim().toUpperCase(); if (UtilValidate.isEmpty(currencyId)) { - String errorMessage = UtilProperties.getMessage(resource, "CurrencyIdRequired", locale); + String errorMessage = UtilProperties.getMessage(RESOURCE, "CurrencyIdRequired", locale); report.println(errorMessage, InterfaceReport.FORMAT_ERROR); errorMessages.put(new CellReference(currencyIdCell), errorMessage); return false; @@ -165,19 +165,19 @@ public class SamplePricatParser extends AbstractPricatParser { try { GenericValue currencyUom = EntityQuery.use(delegator).from("Uom").where("uomId", currencyId).queryOne(); if (!"CURRENCY_MEASURE".equals(currencyUom.getString("uomTypeId"))) { - String errorMessage = UtilProperties.getMessage(resource, "CurrencyIdNotCurrency", new Object[] {currencyId}, locale); + String errorMessage = UtilProperties.getMessage(RESOURCE, "CurrencyIdNotCurrency", new Object[] {currencyId}, locale); report.println(errorMessage, InterfaceReport.FORMAT_ERROR); errorMessages.put(new CellReference(currencyIdCell), errorMessage); return false; } } catch(GenericEntityException e) { - String errorMessage = UtilProperties.getMessage(resource, "CurrencyIdNotFound", new Object[] {currencyId}, locale); + String errorMessage = UtilProperties.getMessage(RESOURCE, "CurrencyIdNotFound", new Object[] {currencyId}, locale); report.println(errorMessage, InterfaceReport.FORMAT_ERROR); errorMessages.put(new CellReference(currencyIdCell), errorMessage); return false; } - report.print(UtilProperties.getMessage(resource, "CurrencyIdIs", new Object[] {currencyId}, locale), InterfaceReport.FORMAT_NOTE); - report.println(" ... " + UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); + report.print(UtilProperties.getMessage(RESOURCE, "CurrencyIdIs", new Object[] {currencyId}, locale), InterfaceReport.FORMAT_NOTE); + report.println(" ... " + UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); } return true; } @@ -205,8 +205,8 @@ public class SamplePricatParser extends AbstractPricatParser { if (emptyRowEnd != -1) { report.print(" - (" + (emptyRowEnd + 1) + ") ", InterfaceReport.FORMAT_NOTE); } - report.print(UtilProperties.getMessage(resource, "ExcelEmptyRow", locale), InterfaceReport.FORMAT_NOTE); - report.println(" ... " + UtilProperties.getMessage(resource, "skipped", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "ExcelEmptyRow", locale), InterfaceReport.FORMAT_NOTE); + report.println(" ... " + UtilProperties.getMessage(RESOURCE, "skipped", locale), InterfaceReport.FORMAT_NOTE); emptyRowStart = -1; emptyRowEnd = -1; } @@ -215,9 +215,9 @@ public class SamplePricatParser extends AbstractPricatParser { List<Object> cellContents = getCellContents(row, colNames, colNumber); try { if (parseCellContentsAndStore(row, cellContents)) { - report.println(" ... " + UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); + report.println(" ... " + UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); } else { - report.println(" ... " + UtilProperties.getMessage(resource, "skipped", locale), InterfaceReport.FORMAT_NOTE); + report.println(" ... " + UtilProperties.getMessage(RESOURCE, "skipped", locale), InterfaceReport.FORMAT_NOTE); } } catch (GenericTransactionException e) { report.println(e); @@ -225,8 +225,8 @@ public class SamplePricatParser extends AbstractPricatParser { } if (emptyRowEnd != -1) { report.print(" - (" + (emptyRowEnd + 1) + ") ", InterfaceReport.FORMAT_NOTE); - report.print(UtilProperties.getMessage(resource, "ExcelEmptyRow", locale), InterfaceReport.FORMAT_NOTE); - report.println(" ... " + UtilProperties.getMessage(resource, "skipped", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "ExcelEmptyRow", locale), InterfaceReport.FORMAT_NOTE); + report.println(" ... " + UtilProperties.getMessage(RESOURCE, "skipped", locale), InterfaceReport.FORMAT_NOTE); } } @@ -294,12 +294,12 @@ public class SamplePricatParser extends AbstractPricatParser { if (features.containsKey("index") && String.valueOf(features.get("index")).contains("0")) { int cell = headerColNames.indexOf("Color"); XSSFCell colorCell = row.getCell(cell); - errorMessages.put(new CellReference(colorCell), UtilProperties.getMessage(resource, "PricatColorError", locale)); + errorMessages.put(new CellReference(colorCell), UtilProperties.getMessage(RESOURCE, "PricatColorError", locale)); } if (features.containsKey("index") && String.valueOf(features.get("index")).contains("1")) { int cell = headerColNames.indexOf("Size"); XSSFCell colorCell = row.getCell(cell); - errorMessages.put(new CellReference(colorCell), UtilProperties.getMessage(resource, "PricatDimensionError", locale)); + errorMessages.put(new CellReference(colorCell), UtilProperties.getMessage(RESOURCE, "PricatDimensionError", locale)); } return false; } @@ -360,7 +360,7 @@ public class SamplePricatParser extends AbstractPricatParser { String theFacilityId = (String) facilities.keySet().toArray()[0]; String name = facilities.get(theFacilityId)[0]; if (!name.equals(facilityName)) { - String errorMessage = UtilProperties.getMessage(resource, "FacilityNameNotMatchId", new Object[]{theFacilityId, name, facilityName}, locale); + String errorMessage = UtilProperties.getMessage(RESOURCE, "FacilityNameNotMatchId", new Object[]{theFacilityId, name, facilityName}, locale); report.println(); report.print(errorMessage, InterfaceReport.FORMAT_ERROR); XSSFCell cell = row.getCell(0); @@ -369,7 +369,7 @@ public class SamplePricatParser extends AbstractPricatParser { } } } else { - String errorMessage = UtilProperties.getMessage(resource, "FacilityNotBelongToYou", new Object[]{facilityName, facilityId}, locale); + String errorMessage = UtilProperties.getMessage(RESOURCE, "FacilityNotBelongToYou", new Object[]{facilityName, facilityId}, locale); report.println(); report.print(errorMessage, InterfaceReport.FORMAT_ERROR); XSSFCell cell = row.getCell(1); @@ -379,7 +379,7 @@ public class SamplePricatParser extends AbstractPricatParser { } else { String name = facilities.get(facilityId)[0]; if (!name.equals(facilityName)) { - String errorMessage = UtilProperties.getMessage(resource, "FacilityNameNotMatchId", new Object[]{facilityId, name, facilityName}, locale); + String errorMessage = UtilProperties.getMessage(RESOURCE, "FacilityNameNotMatchId", new Object[]{facilityId, name, facilityName}, locale); report.println(); report.print(errorMessage, InterfaceReport.FORMAT_ERROR); XSSFCell cell = row.getCell(0); @@ -394,28 +394,28 @@ public class SamplePricatParser extends AbstractPricatParser { public boolean isTableHeaderMatched(XSSFSheet sheet) { List<Object[]> columnNames = ColNamesList.get(pricatFileVersion); short cols = sheet.getRow(headerRowNo).getLastCellNum(); - report.print(UtilProperties.getMessage(resource, "StartCheckHeaderColNum", new Object[] {pricatFileVersion}, locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "StartCheckHeaderColNum", new Object[] {pricatFileVersion}, locale), InterfaceReport.FORMAT_NOTE); if (cols != columnNames.size()) { - report.print(UtilProperties.getMessage(resource, "HeaderColNumNotMatch", new Object[] {String.valueOf(cols), String.valueOf(columnNames.size())}, locale), InterfaceReport.FORMAT_WARNING); + report.print(UtilProperties.getMessage(RESOURCE, "HeaderColNumNotMatch", new Object[] {String.valueOf(cols), String.valueOf(columnNames.size())}, locale), InterfaceReport.FORMAT_WARNING); if (cols < columnNames.size()) { - report.println(UtilProperties.getMessage(resource, "HeaderColNumShortThanRequired", new Object[] {String.valueOf(columnNames.size())}, locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "HeaderColNumShortThanRequired", new Object[] {String.valueOf(columnNames.size())}, locale), InterfaceReport.FORMAT_ERROR); return false; } else { - report.println(UtilProperties.getMessage(resource, "UseHeaderColNum", new Object[] {String.valueOf(columnNames.size())}, locale), InterfaceReport.FORMAT_WARNING); + report.println(UtilProperties.getMessage(RESOURCE, "UseHeaderColNum", new Object[] {String.valueOf(columnNames.size())}, locale), InterfaceReport.FORMAT_WARNING); cols = (short) columnNames.size(); } } else { - report.println(UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); + report.println(UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); } - report.print(UtilProperties.getMessage(resource, "StartCheckHeaderColLabel", new Object[] {pricatFileVersion}, locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "StartCheckHeaderColLabel", new Object[] {pricatFileVersion}, locale), InterfaceReport.FORMAT_NOTE); boolean foundLabelNotMatch = false; for (int i = 0; i < cols; i++) { String coltext = sheet.getRow(headerRowNo).getCell(i).getStringCellValue().trim(); headerColNames.add(coltext); Object[] versionColumn = columnNames.get(i); if (!coltext.equals(versionColumn[0])) { - report.println(UtilProperties.getMessage(resource, "HeaderColLabelNotMatch", new Object[] {String.valueOf(headerRowNo + 1), String.valueOf(i + 1), coltext, versionColumn[0]}, locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "HeaderColLabelNotMatch", new Object[] {String.valueOf(headerRowNo + 1), String.valueOf(i + 1), coltext, versionColumn[0]}, locale), InterfaceReport.FORMAT_ERROR); foundLabelNotMatch = true; } else { report.print(" " + coltext, InterfaceReport.FORMAT_NOTE); @@ -428,20 +428,20 @@ public class SamplePricatParser extends AbstractPricatParser { report.println(); return false; } - report.println(" ... " + UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); + report.println(" ... " + UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); return true; } @Override public boolean isVersionSupported(XSSFSheet sheet) { - report.print(UtilProperties.getMessage(resource, "StartCheckPricatVersion", locale), InterfaceReport.FORMAT_NOTE); + report.print(UtilProperties.getMessage(RESOURCE, "StartCheckPricatVersion", locale), InterfaceReport.FORMAT_NOTE); pricatFileVersion = sheet.getRow(2).getCell(0).getStringCellValue().trim(); if (ColNamesList.containsKey(pricatFileVersion)) { report.print(" " + pricatFileVersion + " ... ", InterfaceReport.FORMAT_NOTE); - report.println(UtilProperties.getMessage(resource, "ok", locale), InterfaceReport.FORMAT_OK); + report.println(UtilProperties.getMessage(RESOURCE, "ok", locale), InterfaceReport.FORMAT_OK); } else { - report.println(UtilProperties.getMessage(resource, "error", locale), InterfaceReport.FORMAT_ERROR); - report.println(UtilProperties.getMessage(resource, "PricatVersionNotSupport", new Object[] {pricatFileVersion}, locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "error", locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "PricatVersionNotSupport", new Object[] {pricatFileVersion}, locale), InterfaceReport.FORMAT_ERROR); return false; } return true; @@ -451,9 +451,9 @@ public class SamplePricatParser extends AbstractPricatParser { public boolean containsDataRows(XSSFSheet sheet) { int rows = sheet.getPhysicalNumberOfRows(); if (rows > headerRowNo + 1) { - report.println(UtilProperties.getMessage(resource, "PricatTableRows", new Object[] {String.valueOf(headerRowNo + 1), String.valueOf(rows - headerRowNo - 1), sheet.getSheetName()}, locale), InterfaceReport.FORMAT_NOTE); + report.println(UtilProperties.getMessage(RESOURCE, "PricatTableRows", new Object[] {String.valueOf(headerRowNo + 1), String.valueOf(rows - headerRowNo - 1), sheet.getSheetName()}, locale), InterfaceReport.FORMAT_NOTE); } else { - report.println(UtilProperties.getMessage(resource, "PricatNoDataRows", new Object[] {sheet.getSheetName()}, locale), InterfaceReport.FORMAT_ERROR); + report.println(UtilProperties.getMessage(RESOURCE, "PricatNoDataRows", new Object[] {sheet.getSheetName()}, locale), InterfaceReport.FORMAT_ERROR); return false; } return true; @@ -567,9 +567,9 @@ public class SamplePricatParser extends AbstractPricatParser { } if (cell == null) { if ((Boolean) colNames.get(i)[2] && (facilities.keySet().size() > 1 || (facilities.keySet().size() == 1 && i >= 2))) { - report.print(UtilProperties.getMessage(resource, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale), InterfaceReport.FORMAT_WARNING); + report.print(UtilProperties.getMessage(RESOURCE, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale), InterfaceReport.FORMAT_WARNING); cell = row.createCell(i); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale)); foundError = true; results.add(null); continue; @@ -598,8 +598,8 @@ public class SamplePricatParser extends AbstractPricatParser { report.print(((i == 0)?"":","), InterfaceReport.FORMAT_NOTE); } if ((Boolean) colNames.get(i)[2] && UtilValidate.isEmpty(cellValue) && (facilities.keySet().size() > 1 || (facilities.keySet().size() == 1 && i >= 2))) { - report.print(UtilProperties.getMessage(resource, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale), InterfaceReport.FORMAT_WARNING); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale)); + report.print(UtilProperties.getMessage(RESOURCE, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale), InterfaceReport.FORMAT_WARNING); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorColCannotEmpty", new Object[] {colNames.get(i)[0]}, locale)); foundError = true; results.add(null); continue; @@ -620,7 +620,7 @@ public class SamplePricatParser extends AbstractPricatParser { results.add(BigDecimal.valueOf(Double.parseDouble(cell.getStringCellValue())).setScale(FinAccountHelper.decimals, FinAccountHelper.rounding)); } catch (NumberFormatException e) { results.add(null); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorParseValueToNumeric", locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorParseValueToNumeric", locale)); } } } else { @@ -641,21 +641,21 @@ public class SamplePricatParser extends AbstractPricatParser { results.add(BigDecimal.valueOf(Double.valueOf(cell.getStringCellValue()))); } catch (NumberFormatException e) { results.add(null); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorParseValueToNumeric", locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorParseValueToNumeric", locale)); } } else if (cell.getCellType() == CellType.NUMERIC) { try { results.add(BigDecimal.valueOf(cell.getNumericCellValue()).setScale(FinAccountHelper.decimals, FinAccountHelper.rounding)); } catch (NumberFormatException e) { results.add(null); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorParseValueToNumeric", locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorParseValueToNumeric", locale)); } } else { try { results.add(BigDecimal.valueOf(Double.valueOf(cellValue)).setScale(FinAccountHelper.decimals, FinAccountHelper.rounding)); } catch (NumberFormatException e) { results.add(null); - errorMessages.put(new CellReference(cell), UtilProperties.getMessage(resource, "ErrorParseValueToNumeric", locale)); + errorMessages.put(new CellReference(cell), UtilProperties.getMessage(RESOURCE, "ErrorParseValueToNumeric", locale)); } } } diff --git a/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java b/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java index 9260193..9fa6446 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/util/OFBizPricatUtil.java @@ -30,7 +30,7 @@ import com.microsoft.schemas.vml.CTShape; public final class OFBizPricatUtil { - public static final String MODULE = OFBizPricatUtil.class.getName(); + private static final String MODULE = OFBizPricatUtil.class.getName(); protected static Method VMLDrawingMethod; diff --git a/projectmgr/src/main/java/org/apache/ofbiz/project/Various.java b/projectmgr/src/main/java/org/apache/ofbiz/project/Various.java index 7a02c94..c126404 100644 --- a/projectmgr/src/main/java/org/apache/ofbiz/project/Various.java +++ b/projectmgr/src/main/java/org/apache/ofbiz/project/Various.java @@ -31,7 +31,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; public class Various { - public static final String MODULE = Various.class.getName(); + private static final String MODULE = Various.class.getName(); public static void setDatesFollowingTasks(GenericValue task) { diff --git a/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java b/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java index 3e3f25f..8b0cfb5 100644 --- a/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java +++ b/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumEvents.java @@ -50,7 +50,7 @@ import org.apache.ofbiz.entity.util.EntityQuery; */ public class ScrumEvents { - public static final String MODULE = ScrumEvents.class.getName(); + private static final String MODULE = ScrumEvents.class.getName(); public static String timeSheetChecker(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { HttpSession session = request.getSession(); diff --git a/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java b/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java index 3a1c2b2..48373ea 100644 --- a/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java +++ b/scrum/src/main/java/org/apache/ofbiz/scrum/ScrumServices.java @@ -48,8 +48,8 @@ import org.apache.ofbiz.service.ServiceUtil; */ public class ScrumServices { - public static final String MODULE = ScrumServices.class.getName(); - public static final String resource = "scrumUiLabels"; + private static final String MODULE = ScrumServices.class.getName(); + private static final String RESOURCE = "scrumUiLabels"; public static Map<String, Object> linkToProduct(DispatchContext ctx, Map<String, ? extends Object> context) { Delegator delegator = ctx.getDelegator(); Locale locale = (Locale)context.get("locale"); @@ -91,7 +91,7 @@ public class ScrumServices { } } catch (GenericServiceException e1) { Debug.logError(e1, "Error calling updating commevent status", MODULE); - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ScrumErrorCallingUpdatingCommeventStatus", locale) + e1.toString()); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ScrumErrorCallingUpdatingCommeventStatus", locale) + e1.toString()); } } else { Debug.logInfo("Product id " + productId + " found in subject but not in database", MODULE); @@ -101,13 +101,13 @@ public class ScrumServices { } } catch (GenericEntityException e) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ScrumFindByPrimaryKeyError", locale) + e.toString()); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ScrumFindByPrimaryKeyError", locale) + e.toString()); } Map<String, Object> result = ServiceUtil.returnSuccess(); return result; } else { - Map<String, Object> result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "ScrumCommunicationEventIdRequired", locale)); + Map<String, Object> result = ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "ScrumCommunicationEventIdRequired", locale)); return result; } } diff --git a/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java b/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java index 063058a..32df73f 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/CategoryUtil.java @@ -39,7 +39,7 @@ import org.apache.ofbiz.service.DispatchContext; */ public final class CategoryUtil { - public static final String MODULE = CategoryUtil.class.getName(); + private static final String MODULE = CategoryUtil.class.getName(); private CategoryUtil () {} diff --git a/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java b/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java index def595b..ee3251b 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java @@ -45,7 +45,7 @@ import org.apache.ofbiz.service.ServiceUtil; * Product utility class for solr. */ public final class ProductUtil { - public static final String MODULE = ProductUtil.class.getName(); + private static final String MODULE = ProductUtil.class.getName(); private ProductUtil () {} diff --git a/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java b/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java index 5128634..d9455c0 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java @@ -62,8 +62,8 @@ import org.apache.ofbiz.service.ServiceValidationException; */ public abstract class SolrProductSearch { - public static final String MODULE = SolrProductSearch.class.getName(); - public static final String resource = "SolrUiLabels"; + private static final String MODULE = SolrProductSearch.class.getName(); + private static final String RESOURCE = "SolrUiLabels"; /** * Adds product to solr, with product denoted by productId field in instance attribute @@ -149,7 +149,7 @@ public abstract class SolrProductSearch { client.add(docs); client.commit(); - final String statusStr = UtilProperties.getMessage(resource, "SolrDocumentForProductIdAddedToSolrIndex", UtilMisc.toMap("productId", context.get("productId")), locale); + final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrDocumentForProductIdAddedToSolrIndex", UtilMisc.toMap("productId", context.get("productId")), locale); Debug.logInfo("Solr: " + statusStr, MODULE); result = ServiceUtil.returnSuccess(statusStr); } @@ -160,7 +160,7 @@ public abstract class SolrProductSearch { } catch (SolrServerException e) { if (e.getCause() != null && e.getCause() instanceof ConnectException) { - final String statusStr = UtilProperties.getMessage(resource, "SolrFailureConnectingToSolrServerToCommitProductId", + final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrFailureConnectingToSolrServerToCommitProductId", UtilMisc.toMap("productId", context.get("productId")), locale); if (Boolean.TRUE.equals(treatConnectErrorNonFatal)) { Debug.logWarning(e, "Solr: " + statusStr, MODULE); @@ -226,7 +226,7 @@ public abstract class SolrProductSearch { client.add(docs); client.commit(); - final String statusStr = UtilProperties.getMessage(resource, "SolrAddedDocumentsToSolrIndex", UtilMisc.toMap("fieldList", fieldList.size()), locale); + final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrAddedDocumentsToSolrIndex", UtilMisc.toMap("fieldList", fieldList.size()), locale); Debug.logInfo("Solr: " + statusStr, MODULE); result = ServiceUtil.returnSuccess(statusStr); } @@ -237,7 +237,7 @@ public abstract class SolrProductSearch { } catch (SolrServerException e) { if (e.getCause() != null && e.getCause() instanceof ConnectException) { - final String statusStr = UtilProperties.getMessage(resource, "SolrFailureConnectingToSolrServerToCommitProductList", + final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrFailureConnectingToSolrServerToCommitProductList", UtilMisc.toMap("productId", context.get("productId")), locale); if (Boolean.TRUE.equals(treatConnectErrorNonFatal)) { Debug.logWarning(e, "Solr: " + statusStr, MODULE); @@ -398,7 +398,7 @@ public abstract class SolrProductSearch { String productCategoryId = (String) context.get("productCategoryId"); dispatchMap.put("query", "cat:*" + productCategoryId + "*"); } else - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "SolrMissingProductCategoryId", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE, "SolrMissingProductCategoryId", locale)); if (context.get("viewSize") != null) dispatchMap.put("viewSize", Integer.parseInt(((String) context.get("viewSize")))); if (context.get("viewIndex") != null) @@ -704,7 +704,7 @@ public abstract class SolrProductSearch { } else if (ServiceUtil.isFailure(runResult)) { result = ServiceUtil.returnFailure(runMsg); } else { - final String statusMsg = UtilProperties.getMessage(resource, "SolrClearedSolrIndexAndReindexedDocuments", UtilMisc.toMap("numDocs", numDocs), locale); + final String statusMsg = UtilProperties.getMessage(RESOURCE, "SolrClearedSolrIndexAndReindexedDocuments", UtilMisc.toMap("numDocs", numDocs), locale); result = ServiceUtil.returnSuccess(statusMsg); } } @@ -714,7 +714,7 @@ public abstract class SolrProductSearch { } catch (SolrServerException e) { if (e.getCause() != null && e.getCause() instanceof ConnectException) { - final String statusStr = UtilProperties.getMessage(resource, "SolrFailureConnectingToSolrServerToRebuildIndex", locale); + final String statusStr = UtilProperties.getMessage(RESOURCE, "SolrFailureConnectingToSolrServerToRebuildIndex", locale); if (Boolean.TRUE.equals(treatConnectErrorNonFatal)) { Debug.logWarning(e, "Solr: " + statusStr, MODULE); result = ServiceUtil.returnFailure(statusStr); diff --git a/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java b/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java index 3e05b70..1d9d837 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java @@ -53,7 +53,7 @@ import org.apache.ofbiz.entity.GenericEntityException; public final class SolrUtil { private SolrUtil() {} - public static final String MODULE = SolrUtil.class.getName(); + private static final String MODULE = SolrUtil.class.getName(); private static final String[] solrProdAttribute = { "productId", "internalName", "manu", "size", "smallImage", "mediumImage", "largeImage", "listPrice", "defaultPrice", "inStock", "isVirtual" }; private static final String solrConfigName = "solrconfig.properties"; diff --git a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java index 185e64a..cd01204 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java @@ -57,9 +57,9 @@ import org.apache.solr.servlet.SolrDispatchFilter; */ public class OFBizSolrContextFilter extends SolrDispatchFilter { - public static final String MODULE = OFBizSolrContextFilter.class.getName(); + private static final String MODULE = OFBizSolrContextFilter.class.getName(); - private static final String resource = "SolrUiLabels"; + private static final String RESOURCE = "SolrUiLabels"; @Override public void init(FilterConfig config) throws ServletException { @@ -95,9 +95,9 @@ public class OFBizSolrContextFilter extends SolrDispatchFilter { os.flush(); String message = ""; if (UtilValidate.isEmpty(userLogin)) { - message = UtilProperties.getMessage(resource, "SolrErrorManageLoginFirst", locale); + message = UtilProperties.getMessage(RESOURCE, "SolrErrorManageLoginFirst", locale); } else { - message = UtilProperties.getMessage(resource, "SolrErrorNoManagePermission", locale); + message = UtilProperties.getMessage(RESOURCE, "SolrErrorNoManagePermission", locale); } Debug.logInfo("[" + httpRequest.getRequestURI().substring(1) + "(Domain:" + request.getScheme() + "://" + request.getServerName() + ")] Request error: " + message, MODULE); } catch (ConversionException e) { @@ -188,12 +188,12 @@ public class OFBizSolrContextFilter extends SolrDispatchFilter { if (UtilValidate.isEmpty(userLogin)) { httpResponse.setStatus(HttpServletResponse.SC_UNAUTHORIZED); responseHeader.put("status", HttpServletResponse.SC_UNAUTHORIZED); - message = UtilProperties.getMessage(resource, notLoginMessage, locale); + message = UtilProperties.getMessage(RESOURCE, notLoginMessage, locale); responseHeader.put("message", message); } else { httpResponse.setStatus(HttpServletResponse.SC_FORBIDDEN); responseHeader.put("status", HttpServletResponse.SC_FORBIDDEN); - message = UtilProperties.getMessage(resource, noPermissionMessage, locale); + message = UtilProperties.getMessage(RESOURCE, noPermissionMessage, locale); responseHeader.put("message", message); } json = mapToJson.convert(UtilMisc.toMap("responseHeader", (Object) responseHeader)); diff --git a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java index 230107e..eee3706 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrLoadAdminUiServlet.java @@ -41,7 +41,7 @@ import org.apache.solr.core.SolrCore; public class OFBizSolrLoadAdminUiServlet extends OFBizSolrRedirectServlet { private static final long serialVersionUID = 1L; - public static final String MODULE = OFBizSolrLoadAdminUiServlet.class.getName(); + private static final String MODULE = OFBizSolrLoadAdminUiServlet.class.getName(); @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java index 0d521cf..eacb860 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java @@ -37,7 +37,7 @@ import org.apache.solr.servlet.RedirectServlet; @SuppressWarnings("serial") public class OFBizSolrRedirectServlet extends RedirectServlet { - public static final String MODULE = OFBizSolrRedirectServlet.class.getName(); + private static final String MODULE = OFBizSolrRedirectServlet.class.getName(); /** * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) diff --git a/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java b/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java index b8dc3cc..91b378a 100644 --- a/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java +++ b/webpos/src/main/java/org/apache/ofbiz/webpos/search/WebPosSearch.java @@ -41,7 +41,7 @@ import org.apache.ofbiz.service.ServiceUtil; public class WebPosSearch { - public static final String MODULE = WebPosSearch.class.getName(); + private static final String MODULE = WebPosSearch.class.getName(); public static Map<String, Object> findProducts(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); diff --git a/webpos/src/main/java/org/apache/ofbiz/webpos/session/WebPosSession.java b/webpos/src/main/java/org/apache/ofbiz/webpos/session/WebPosSession.java index 1a4719d..c3db98a 100755 --- a/webpos/src/main/java/org/apache/ofbiz/webpos/session/WebPosSession.java +++ b/webpos/src/main/java/org/apache/ofbiz/webpos/session/WebPosSession.java @@ -40,7 +40,7 @@ import org.apache.ofbiz.webpos.transaction.WebPosTransaction; public class WebPosSession { - public static final String MODULE = WebPosSession.class.getName(); + private static final String MODULE = WebPosSession.class.getName(); private String id = null; private Map<String, Object> attributes = new HashMap<>(); diff --git a/webpos/src/main/java/org/apache/ofbiz/webpos/transaction/WebPosTransaction.java b/webpos/src/main/java/org/apache/ofbiz/webpos/transaction/WebPosTransaction.java index 5a52584..eaaffc2 100755 --- a/webpos/src/main/java/org/apache/ofbiz/webpos/transaction/WebPosTransaction.java +++ b/webpos/src/main/java/org/apache/ofbiz/webpos/transaction/WebPosTransaction.java @@ -48,8 +48,8 @@ import org.apache.ofbiz.webpos.session.WebPosSession; public class WebPosTransaction { - public static final String resource = "WebPosUiLabels"; - public static final String MODULE = WebPosTransaction.class.getName(); + private static final String RESOURCE = "WebPosUiLabels"; + private static final String MODULE = WebPosTransaction.class.getName(); public static final int NO_PAYMENT = 0; public static final int INTERNAL_PAYMENT = 1; public static final int EXTERNAL_PAYMENT = 2; @@ -196,7 +196,7 @@ public class WebPosTransaction { BigDecimal grandTotal = this.getGrandTotal(); BigDecimal paymentAmt = this.getPaymentTotal(); if (grandTotal.compareTo(paymentAmt) > 0) { - throw new GeneralException(UtilProperties.getMessage(resource, "WebPosNotEnoughFunds", webPosSession.getLocale())); + throw new GeneralException(UtilProperties.getMessage(RESOURCE, "WebPosNotEnoughFunds", webPosSession.getLocale())); } // attach the party ID to the cart |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |